Skip to content

Commit

Permalink
Merge commit '073cad9d12b98e43650645e48c41fddba7331197' into embedlit…
Browse files Browse the repository at this point in the history 
…e_upgrade

Conflicts:
	gfx/gl/GLContextProviderEGL.cpp
	gfx/gl/GLContextProviderGLX.cpp
	gfx/layers/opengl/CompositorOGL.cpp
	gfx/thebes/gfxAndroidPlatform.cpp
	js/src/config/system-headers
	layout/ipc/RenderFrameParent.cpp
  • Loading branch information
@tmeshkova
tmeshkova committed Jan 15, 2014
2 parents e7971c1 + 073cad9 commit 3b6cd0b
Show file tree
Hide file tree
Showing 3,588 changed files with 107,209 additions and 92,590 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 9 additions & 0 deletions .lldbinit
View file
Expand Up @@ -5,3 +5,12 @@
# See http://lldb.llvm.org/troubleshooting.html for more info.
settings set target.inline-breakpoint-strategy always

# Show the dynamic type of an object when using "expr". This, for example,
# will show a variable declared as "nsIFrame *" that points to an nsBlockFrame
# object as being of type "nsBlockFrame *" rather than "nsIFrame *".
settings set target.prefer-dynamic-value run-target

# Import the module that defines complex Gecko debugging commands. Rather
# than do any kind of searching, this assumes that you are running lldb from
# the top level source directory.
script sys.path.append('python/lldbutils'); import lldbutils; lldbutils.init()
2 changes: 1 addition & 1 deletion CLOBBER
View file
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 939022 requires clobber change due to files relocation.
Bug 897735 requires a clobber due to mass mochitest bustage otherwise
55 changes: 51 additions & 4 deletions Makefile.in
View file
Expand Up @@ -17,15 +17,19 @@ export TOPLEVEL_BUILD := 1

default::

ifdef MOZ_BUILD_APP
include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
endif

include $(topsrcdir)/config/config.mk

ifndef LIBXUL_SDK
ifdef COMPILE_ENVIRONMENT
ifndef BUILDING_JS
BUILD_JS = 1
endif
endif
endif

GARBAGE_DIRS += dist _javagen _profile staticlib
DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
Expand All @@ -34,29 +38,40 @@ DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
.mozconfig.mk

ifdef BUILDING_JS
configure_dir = $(topsrcdir)/js/src
else
configure_dir = $(topsrcdir)
endif

ifndef MOZ_PROFILE_USE
# We need to explicitly put backend.RecursiveMakeBackend here
# otherwise the rule in rules.mk doesn't run early enough.
libs binaries export tools:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend
libs binaries export tools:: CLOBBER $(configure_dir)/configure config.status backend.RecursiveMakeBackend
ifdef BUILD_JS
libs binaries export tools:: js-config-status
endif
endif

ifdef BUILDING_JS
.PHONY: CLOBBER
CLOBBER:
else
CLOBBER: $(topsrcdir)/CLOBBER
@echo 'STOP! The CLOBBER file has changed.'
@echo 'Please run the build through a sanctioned build wrapper, such as'
@echo '"mach build" or client.mk.'
@exit 1
endif

$(topsrcdir)/configure: $(topsrcdir)/configure.in
$(configure_dir)/configure: $(configure_dir)/configure.in
@echo 'STOP! configure.in has changed, and your configure is out of date.'
@echo 'Please rerun autoconf and re-configure your build directory.'
@echo 'To ignore this message, touch "configure" in the source directory,'
@echo 'but your build might not succeed.'
@exit 1

config.status: $(topsrcdir)/configure
config.status: $(configure_dir)/configure
@echo 'STOP! configure has changed and needs to be run in this build directory.'
@echo 'Please rerun configure.'
@echo 'To ignore this message, touch "config.status" in the build directory,'
Expand Down Expand Up @@ -90,7 +105,7 @@ endif
install_manifests := bin idl include public private sdk
install_manifest_depends = \
CLOBBER \
$(topsrcdir)/configure \
$(configure_dir)/configure \
config.status \
backend.RecursiveMakeBackend \
$(NULL)
Expand All @@ -102,6 +117,18 @@ endif
.PHONY: install-manifests
install-manifests: $(addprefix install-dist-,$(install_manifests))

# process_install_manifest needs to be invoked with --no-remove when building
# js as standalone because automated builds are building nspr separately and
# that would remove the resulting files. It is also necessary when building
# js as part of gecko because that would remove the files exported from gecko.
# Eventually, a standalone js build would just be able to build nspr itself,
# removing the need for the former. But that won't likely happen before
# finishing to merge gecko and js build systems, removing the need for the
# latter.
ifdef BUILDING_JS
NO_REMOVE=1
endif

.PHONY: $(addprefix install-dist-,$(install_manifests))
$(addprefix install-dist-,$(install_manifests)): install-dist-%: $(install_manifest_depends)
$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$* $(if $(BUILD_JS),js/src/_build_manifests/install/dist_$*))
Expand Down Expand Up @@ -139,10 +166,12 @@ endif
# with no regard for PGO passes. This decision could probably be revisited.
export:: install-dist-sdk

ifndef BUILDING_JS
ifdef ENABLE_TESTS
# Additional makefile targets to call automated test suites
include $(topsrcdir)/testing/testsuite-targets.mk
endif
endif

default all::
$(call BUILDSTATUS,TIERS export $(if $(COMPILE_ENVIRONMENT),$(if $(MOZ_PSEUDO_DERECURSE),compile ))libs tools)
Expand Down Expand Up @@ -181,6 +210,7 @@ endif

SYM_STORE_SOURCE_DIRS := $(topsrcdir)

ifndef BUILDING_JS
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk

ifdef MOZ_SYMBOLS_EXTRA_BUILDID
Expand Down Expand Up @@ -225,6 +255,7 @@ endif
# so transform it to an immediate assignment.
MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP)
export MOZ_SOURCE_STAMP
endif

#XXX: this is a hack, since we don't want to clobber for MSVC
# PGO support, but we can't do this test in client.mk
Expand All @@ -250,6 +281,21 @@ check::
@relcount=`find $(DIST)/bin -name '*.so' | xargs objdump -R | grep R_386_PC32 | wc -l` && if test $$relcount -gt 0; then echo 'FAILED: R_386_PC32 relocations detected in a shared library. Did you use a system header without adding it to config/system-headers?'; exit 1; else echo 'PASSED'; fi
endif

ifdef BUILDING_JS
# Delegate js-specific rules to js
check-%:
$(MAKE) -C js/src $@

source-package install:
$(MAKE) -C js/src $@

# Every export rule depends on config/export, but the rule for config/export
# doesn't exist when building js non-standalone.
.PHONY: config/export
config/export:

else

ifdef BUILD_JS
js/src/Makefile: subsrcdir := js/src

Expand All @@ -263,3 +309,4 @@ js/src/export config/export: build/clang-plugin/export
endif
endif
endif
endif
14 changes: 7 additions & 7 deletions accessible/src/base/moz.build
View file
Expand Up @@ -59,17 +59,17 @@ if a11y_log:
]

LOCAL_INCLUDES += [
'../../../content/xbl/src',
'../../../ipc/chromium/src',
'../../../layout/generic',
'../../../layout/style',
'../../../layout/svg',
'../../../layout/xul',
'../../../layout/xul/tree/',
'../generic',
'../html',
'../xpcom',
'../xul',
'/dom/xbl',
'/ipc/chromium/src',
'/layout/generic',
'/layout/style',
'/layout/svg',
'/layout/xul',
'/layout/xul/tree/',
]

if CONFIG['MOZ_ENABLE_GTK']:
Expand Down
1 change: 0 additions & 1 deletion accessible/src/generic/DocAccessible.h
View file
Expand Up @@ -21,7 +21,6 @@
#include "nsIScrollPositionListener.h"
#include "nsITimer.h"
#include "nsIWeakReference.h"
#include "nsIDocShellTreeNode.h"

class nsAccessiblePivot;

Expand Down
16 changes: 14 additions & 2 deletions accessible/src/generic/HyperTextAccessible.cpp
View file
Expand Up @@ -27,6 +27,7 @@
#include "nsIPersistentProperties2.h"
#include "nsIScrollableFrame.h"
#include "nsIServiceManager.h"
#include "nsITextControlElement.h"
#include "nsTextFragment.h"
#include "mozilla/Selection.h"
#include "mozilla/MathAlgorithms.h"
Expand Down Expand Up @@ -102,8 +103,19 @@ HyperTextAccessible::NativeState()
{
uint64_t states = AccessibleWrap::NativeState();

nsCOMPtr<nsIEditor> editor = GetEditor();
if (editor) {
nsCOMPtr<nsITextControlElement> textControl = do_QueryInterface(mContent);
bool editable = !!textControl;
Accessible* hyperText = this;
while (!editable && hyperText) {
if (hyperText->IsHyperText())
editable = hyperText->GetNode()->IsEditable();
if (hyperText->IsDoc())
break;

hyperText = hyperText->Parent();
}

if (editable) {
states |= states::EDITABLE;

} else if (mContent->Tag() == nsGkAtoms::article) {
Expand Down
1 change: 1 addition & 0 deletions accessible/src/html/HTMLSelectAccessible.cpp
View file
Expand Up @@ -218,6 +218,7 @@ HTMLSelectOptionAccessible::NativeState()
// visible option
if (!selected) {
state |= states::OFFSCREEN;
state ^= states::INVISIBLE;
} else {
// Clear offscreen and invisible for currently showing option
state &= ~(states::OFFSCREEN | states::INVISIBLE);
Expand Down
19 changes: 19 additions & 0 deletions accessible/tests/mochitest/attributes/test_obj_group.html
View file
Expand Up @@ -16,6 +16,13 @@
<script type="application/javascript">
function doTest()
{
//////////////////////////////////////////////////////////////////////////
// HTML select with no size attribute.
testGroupAttrs("opt1-nosize", 1, 4);
testGroupAttrs("opt2-nosize", 2, 4);
testGroupAttrs("opt3-nosize", 3, 4);
testGroupAttrs("opt4-nosize", 4, 4);

//////////////////////////////////////////////////////////////////////////
// HTML select
testGroupAttrs("opt1", 1, 2);
Expand Down Expand Up @@ -196,12 +203,24 @@
title="Support nested ARIA listitems structured by role='group'">
Bug 864224
</a>
<a target="_blank"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=907682"
title=" HTML:option group position is not correct when select is collapsed">
Mozilla Bug 907682
</a>

<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
</pre>

<select>
<option id="opt1-nosize">option1</option>
<option id="opt2-nosize">option2</option>
<option id="opt3-nosize">option3</option>
<option id="opt4-nosize">option4</option>
</select>

<select size="4">
<option id="opt1">option1</option>
<option id="opt2">option2</option>
Expand Down
16 changes: 14 additions & 2 deletions accessible/tests/mochitest/elm/test_HTMLSpec.html
View file
Expand Up @@ -733,17 +733,29 @@
states: STATE_PROTECTED,
extraStates: EXT_STATE_EDITABLE,
actions: "activate",
children: [ ]
children: [
{
role: ROLE_TEXT_LEAF
}
]
};
testElm("input_password", obj);
ok(getAccessible("input_password").firstChild.name != "44",
"text leaf for password shouldn't have its real value as its name!");

obj = {
role: ROLE_PASSWORD_TEXT,
states: STATE_PROTECTED | STATE_READONLY,
actions: "activate",
children: [ ]
children: [
{
role: ROLE_TEXT_LEAF
}
]
};
testElm("input_password_readonly", obj);
ok(getAccessible("input_password_readonly").firstChild.name != "44",
"text leaf for password shouldn't have its real value as its name!");

//////////////////////////////////////////////////////////////////////////
// HTML:input@type="radio"
Expand Down
23 changes: 23 additions & 0 deletions accessible/tests/mochitest/states/test_selects.html
View file
Expand Up @@ -73,6 +73,19 @@
testStates(opt2, STATE_SELECTABLE | STATE_FOCUSABLE, 0, STATE_SELECTED, 0,
STATE_FOCUSED, EXT_STATE_ACTIVE);

// collapsed combobox
testStates("collapsedcombobox",
STATE_COLLAPSED | STATE_FOCUSABLE, 0,
STATE_FOCUSED, 0);

testStates("collapsed-1",
STATE_FOCUSABLE | STATE_SELECTABLE, 0,
STATE_OFFSCREEN | STATE_INVISIBLE, 0);

testStates("collapsed-2",
STATE_OFFSCREEN, 0,
STATE_INVISIBLE, 0);

// listbox
testStates("listbox",
STATE_FOCUSABLE, 0,
Expand Down Expand Up @@ -150,6 +163,11 @@
title="Isolate focusable and unavailable states from State()">
Mozilla Bug 756983
</a>
<a target="_blank"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=907682"
title=" HTML:option group position is not correct when select is collapsed">
Mozilla Bug 907682
</a>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
Expand All @@ -160,6 +178,11 @@
<option>item 2</option>
</select>

<select id="collapsedcombobox">
<option id="collapsed-1">item 1</option>
<option id="collapsed-2">item 2</option>
</select>

<select id="listbox" name="component" size="3">
<option id="listitem-active">Build</option>
<option id="listitem">Disability Access APIs</option>
Expand Down
16 changes: 15 additions & 1 deletion accessible/tests/mochitest/text/test_lineboundary.html
View file
Expand Up @@ -108,6 +108,12 @@
BOUNDARY_LINE_START,
[ [ 0, 3, "foo\n", 0, 4 ], [ 4, 4, "", 4, 4 ] ]);

//////////////////////////////////////////////////////////////////////////
// 'Hello world ' (\n is rendered as space)

testTextAtOffset([ "ht_4" ], BOUNDARY_LINE_START,
[ [ 0, 12, "Hello world ", 0, 12 ] ]);

//////////////////////////////////////////////////////////////////////////
// list items

Expand Down Expand Up @@ -138,7 +144,12 @@
href="https://bugzilla.mozilla.org/show_bug.cgi?id=882292">
Bug 882292
</a>

<a target="_blank"
title="getTextAtOffset broken for last object when closing tag is preceded by newline char"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=947170">
Bug 947170
</a>

<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
Expand Down Expand Up @@ -173,6 +184,9 @@
<iframe id="ht_2" src="data:text/html,<div contentEditable='true'>foo<br/></div>"></iframe>
<iframe id="ht_3" src="data:text/html,<div contentEditable='true'>foo<br/><br/></div>"></iframe>

<p id="ht_4">Hello world
</p>

<ul>
<li id="li1">Item</li>
</ul>
Expand Down

0 comments on commit 3b6cd0b

Please sign in to comment.