Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to fx-team on a CLOSED TREE

Browse Source
This commit is contained in:
Gijs Kruitbosch 2013-11-18 17:01:32 +01:00
commit 8dd0a06534
19 changed files with 507 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/base/content/test/general/browser.ini
View File

@ -9,6 +9,13 @@ support-files =
blockPluginHard.xml
blockPluginVulnerableNoUpdate.xml
blockPluginVulnerableUpdatable.xml
browser_bug479408_sample.html
browser_bug678392-1.html
browser_bug678392-2.html
browser_clearplugindata.html
browser_clearplugindata_noage.html
browser_registerProtocolHandler_notification.html
browser_tab_dragdrop2_frame1.xul
bug564387.html
bug564387_video1.ogv
bug564387_video1.ogv^headers^
@ -139,7 +146,6 @@ skip-if = toolkit == "cocoa"
[browser_bug462673.js]
[browser_bug477014.js]
[browser_bug479408.js]
[browser_bug479408_sample.html]
[browser_bug481560.js]
[browser_bug484315.js]
[browser_bug491431.js]
@ -192,8 +198,6 @@ run-if = toolkit == "cocoa"
[browser_bug655584.js]
[browser_bug664672.js]
[browser_bug676619.js]
[browser_bug678392-1.html]
[browser_bug678392-2.html]
[browser_bug678392.js]
[browser_bug710878.js]
[browser_bug719271.js]
@ -225,9 +229,7 @@ run-if = toolkit == "cocoa"
[browser_bug902156.js]
[browser_bug906190.js]
[browser_canonizeURL.js]
[browser_clearplugindata.html]
[browser_clearplugindata.js]
[browser_clearplugindata_noage.html]
[browser_contentAreaClick.js]
[browser_contextSearchTabPosition.js]
[browser_ctrlTab.js]
@ -294,10 +296,8 @@ skip-if = true # disabled until the tree view is added
[browser_tab_drag_drop_perwindow.js]
[browser_tab_dragdrop.js]
[browser_tab_dragdrop2.js]
[browser_tab_dragdrop2_frame1.xul]
[browser_tabbar_big_widgets.js]
skip-if = os == "linux" # No tabs in titlebar on linux
[browser_tabfocus.js]
[browser_tabopen_reflows.js]
[browser_tabs_isActive.js]
@ -323,5 +323,4 @@ skip-if = os == "linux" # No tabs in titlebar on linux
[browser_wyciwyg_urlbarCopying.js]
[browser_zbug569342.js]
[browser_registerProtocolHandler_notification.js]
[browser_registerProtocolHandler_notification.html]
[browser_no_mcb_on_http_site.js]

20
browser/components/privatebrowsing/test/browser/browser.ini
View File

@ -1,5 +1,15 @@
[DEFAULT]
support-files =
browser_privatebrowsing_concurrent_page.html
browser_privatebrowsing_cookieacceptdialog.html
browser_privatebrowsing_geoprompt_page.html
browser_privatebrowsing_localStorage_before_after_page.html
browser_privatebrowsing_localStorage_before_after_page2.html
browser_privatebrowsing_localStorage_page1.html
browser_privatebrowsing_localStorage_page2.html
browser_privatebrowsing_placesTitleNoUpdate.html
browser_privatebrowsing_protocolhandler_page.html
browser_privatebrowsing_windowtitle_page.html
head.js
popup.html
title.sjs
@ -11,38 +21,28 @@ support-files =
# Disabled for too many intermittent failures (bug 895390)
[browser_privatebrowsing_certexceptionsui.js]
[browser_privatebrowsing_concurrent.js]
[browser_privatebrowsing_concurrent_page.html]
[browser_privatebrowsing_cookieacceptdialog.html]
[browser_privatebrowsing_cookieacceptdialog.js]
[browser_privatebrowsing_crh.js]
[browser_privatebrowsing_downloadLastDir.js]
[browser_privatebrowsing_downloadLastDir_c.js]
[browser_privatebrowsing_downloadLastDir_toggle.js]
[browser_privatebrowsing_geoprompt.js]
[browser_privatebrowsing_geoprompt_page.html]
[browser_privatebrowsing_lastpbcontextexited.js]
[browser_privatebrowsing_localStorage.js]
[browser_privatebrowsing_localStorage_before_after.js]
[browser_privatebrowsing_localStorage_before_after_page.html]
[browser_privatebrowsing_localStorage_before_after_page2.html]
[browser_privatebrowsing_localStorage_page1.html]
[browser_privatebrowsing_localStorage_page2.html]
[browser_privatebrowsing_noSessionRestoreMenuOption.js]
[browser_privatebrowsing_nonbrowser.js]
[browser_privatebrowsing_openLocationLastURL.js]
[browser_privatebrowsing_opendir.js]
[browser_privatebrowsing_openlocation.js]
[browser_privatebrowsing_placesTitleNoUpdate.html]
[browser_privatebrowsing_placesTitleNoUpdate.js]
[browser_privatebrowsing_placestitle.js]
[browser_privatebrowsing_popupblocker.js]
[browser_privatebrowsing_protocolhandler.js]
[browser_privatebrowsing_protocolhandler_page.html]
[browser_privatebrowsing_sidebar.js]
[browser_privatebrowsing_theming.js]
[browser_privatebrowsing_ui.js]
[browser_privatebrowsing_urlbarfocus.js]
[browser_privatebrowsing_windowtitle.js]
[browser_privatebrowsing_windowtitle_page.html]
[browser_privatebrowsing_zoom.js]
[browser_privatebrowsing_zoomrestore.js]

5
browser/devtools/fontinspector/test/browser.ini
View File

@ -1,5 +1,6 @@
[DEFAULT]
support-files =
browser_font.woff
browser_fontinspector.html
[browser_font.woff]
[browser_fontinspector.html]
[browser_fontinspector.js]

7
browser/devtools/framework/test/browser.ini
View File

@ -1,5 +1,8 @@
[DEFAULT]
support-files = head.js
support-files =
browser_toolbox_options_disablejs.html
browser_toolbox_options_disablejs_iframe.html
head.js
[browser_devtools_api.js]
[browser_dynamic_tool_enabling.js]
@ -10,9 +13,7 @@ support-files = head.js
[browser_toolbox_highlight.js]
[browser_toolbox_hosts.js]
[browser_toolbox_options.js]
[browser_toolbox_options_disablejs.html]
[browser_toolbox_options_disablejs.js]
[browser_toolbox_options_disablejs_iframe.html]
[browser_toolbox_raise.js]
skip-if = os == "win"
[browser_toolbox_ready.js]

23
browser/devtools/inspector/test/browser.ini
View File

@ -1,10 +1,19 @@
[DEFAULT]
support-files = head.js
support-files =
browser_inspector_breadcrumbs.html
browser_inspector_bug_650804_search.html
browser_inspector_bug_831693_search_suggestions.html
browser_inspector_cmd_inspect.html
browser_inspector_dead_node_exception.html
browser_inspector_destroyselection.html
browser_inspector_menu.html
browser_inspector_select_last_selected.html
browser_inspector_select_last_selected2.html
browser_inspector_bug_848731_reset_selection_on_delete.html
head.js
[browser_inspector_basic_highlighter.js]
[browser_inspector_breadcrumbs.html]
[browser_inspector_breadcrumbs.js]
[browser_inspector_bug_650804_search.html]
[browser_inspector_bug_650804_search.js]
[browser_inspector_bug_665880.js]
[browser_inspector_bug_672902_keyboard_shortcuts.js]
@ -13,17 +22,13 @@ support-files = head.js
[browser_inspector_bug_817558_delete_node.js]
[browser_inspector_bug_831693_combinator_suggestions.js]
[browser_inspector_bug_831693_input_suggestion.js]
[browser_inspector_bug_831693_search_suggestions.html]
# [browser_inspector_bug_831693_searchbox_panel_navigation.js]
# Disabled for too many intermittent failures (bug 851349)
[browser_inspector_bug_835722_infobar_reappears.js]
[browser_inspector_bug_840156_destroy_after_navigation.js]
[browser_inspector_changes.js]
[browser_inspector_cmd_inspect.html]
[browser_inspector_cmd_inspect.js]
[browser_inspector_dead_node_exception.html]
[browser_inspector_dead_node_exception.js]
[browser_inspector_destroyselection.html]
[browser_inspector_destroyselection.js]
[browser_inspector_highlighter.js]
[browser_inspector_highlighter_autohide.js]
@ -31,17 +36,13 @@ support-files = head.js
[browser_inspector_infobar.js]
[browser_inspector_initialization.js]
[browser_inspector_invalidate.js]
[browser_inspector_menu.html]
[browser_inspector_menu.js]
[browser_inspector_navigation.js]
[browser_inspector_pseudoClass_menu.js]
[browser_inspector_pseudoclass_lock.js]
[browser_inspector_reload.js]
[browser_inspector_scrolling.js]
[browser_inspector_select_last_selected.html]
[browser_inspector_select_last_selected.js]
[browser_inspector_select_last_selected2.html]
[browser_inspector_sidebarstate.js]
[browser_inspector_bug_848731_reset_selection_on_delete.js]
[browser_inspector_bug_848731_reset_selection_on_delete.html]
[browser_inspector_bug_922125_destroy_on_navigate.js]

15
browser/devtools/markupview/test/browser.ini
View File

@ -1,20 +1,21 @@
[DEFAULT]
support-files = head.js
support-files =
browser_inspector_markup_edit.html
browser_inspector_markup_mutation.html
browser_inspector_markup_mutation_flashing.html
browser_inspector_markup_navigation.html
browser_inspector_markup_subset.html
browser_inspector_markup_765105_tooltip.png
head.js
[browser_bug896181_css_mixed_completion_new_attribute.js]
# Bug 916763 - too many intermittent failures
skip-if = true
[browser_inspector_markup_edit.html]
[browser_inspector_markup_edit.js]
[browser_inspector_markup_edit_outerhtml.js]
[browser_inspector_markup_edit_outerhtml2.js]
[browser_inspector_markup_mutation.html]
[browser_inspector_markup_mutation.js]
[browser_inspector_markup_mutation_flashing.html]
[browser_inspector_markup_mutation_flashing.js]
[browser_inspector_markup_navigation.html]
[browser_inspector_markup_navigation.js]
[browser_inspector_markup_subset.html]
[browser_inspector_markup_subset.js]
[browser_inspector_markup_765105_tooltip.js]
[browser_inspector_markup_765105_tooltip.png]

2
browser/devtools/scratchpad/scratchpad.xul
View File

@ -28,6 +28,8 @@
width="640" height="480"
persist="screenX screenY width height sizemode">
<script type="application/javascript;version=1.8"
src="chrome://browser/content/devtools/theme-switching.js"/>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/javascript" src="chrome://browser/content/devtools/scratchpad.js"/>

20
browser/devtools/shadereditor/test/browser_webgl-actor-test-16.js
View File

@ -10,12 +10,30 @@ function ifWebGLSupported() {
let [target, debuggee, front] = yield initBackend(SIMPLE_CANVAS_URL);
front.setup({ reload: false });
// 0. Perform the initial reload.
reload(target);
let firstProgram = yield once(front, "program-linked");
let programs = yield front.getPrograms();
is(programs.length, 1,
"The first program should be returned by a call to getPrograms().");
is(programs[0], firstProgram,
"The first programs was correctly retrieved from the cache.");
// 1. Perform a simple navigation.
navigate(target, MULTIPLE_CONTEXTS_URL);
let secondProgram = yield once(front, "program-linked");
let thirdProgram = yield once(front, "program-linked");
let programs = yield front.getPrograms();
is(programs.length, 2,
"The second and third programs should be returned by a call to getPrograms().");
is(programs[0], secondProgram,
"The second programs was correctly retrieved from the cache.");
is(programs[1], thirdProgram,
"The third programs was correctly retrieved from the cache.");
// 2. Perform a bfcache navigation.
yield navigateInHistory(target, "back");
let globalDestroyed = observe("inner-window-destroyed");
@ -35,6 +53,8 @@ function ifWebGLSupported() {
yield checkHighlightingInTheFirstPage(programs[0]);
ok(true, "The cached programs behave correctly after navigating back and reloading.");
// 3. Perform a bfcache navigation and a page reload.
yield navigateInHistory(target, "forward");
let globalDestroyed = observe("inner-window-destroyed");
let globalCreated = observe("content-document-global-created");

10
browser/devtools/shared/test/browser.ini
View File

@ -1,13 +1,16 @@
[DEFAULT]
support-files =
browser_layoutHelpers.html
browser_layoutHelpers_iframe.html
browser_templater_basic.html
browser_toolbar_basic.html
browser_toolbar_webconsole_errors_count.html
head.js
leakhunt.js
[browser_css_color.js]
[browser_eventemitter_basic.js]
[browser_layoutHelpers.html]
[browser_layoutHelpers.js]
[browser_layoutHelpers_iframe.html]
[browser_observableobject.js]
[browser_outputparser.js]
[browser_require_basic.js]
@ -23,11 +26,8 @@ support-files =
[browser_telemetry_toolboxtabs_options.js]
[browser_telemetry_toolboxtabs_styleeditor.js]
[browser_telemetry_toolboxtabs_webconsole.js]
[browser_templater_basic.html]
[browser_templater_basic.js]
[browser_toolbar_basic.html]
[browser_toolbar_basic.js]
[browser_toolbar_tooltip.js]
[browser_toolbar_webconsole_errors_count.html]
[browser_toolbar_webconsole_errors_count.js]
[browser_spectrum.js]

3
browser/devtools/shared/widgets/VariablesView.xul
View File

@ -12,5 +12,8 @@
]>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&PropertiesViewWindowTitle;">
<script type="application/javascript;version=1.8"
src="chrome://browser/content/devtools/theme-switching.js"/>
<vbox id="variables" flex="1"/>
</window>

2
browser/devtools/styleeditor/test/browser.ini
View File

@ -1,5 +1,6 @@
[DEFAULT]
support-files =
browser_styleeditor_cmd_edit.html
four.html
head.js
import.css
@ -24,7 +25,6 @@ support-files =
[browser_styleeditor_bug_740541_iframes.js]
[browser_styleeditor_bug_851132_middle_click.js]
[browser_styleeditor_bug_870339.js]
[browser_styleeditor_cmd_edit.html]
[browser_styleeditor_cmd_edit.js]
[browser_styleeditor_enabled.js]
[browser_styleeditor_filesave.js]

1
build/annotationProcessors/utils/Utils.java
View File

@ -247,6 +247,7 @@ public class Utils {
while (name.endsWith("[]")) {
sb.append('[');
name = name.substring(0, len - 2);
len = len - 2;
}
// Look in the hashmap for the remainder...

4
dom/tests/browser/browser.ini
View File

@ -1,5 +1,7 @@
[DEFAULT]
support-files =
browser_frame_elements.html
browser_geolocation_privatebrowsing_page.html
network_geolocation.sjs
page_privatestorageevent.html
test-console-api.html
@ -12,9 +14,7 @@ support-files =
[browser_bug396843.js]
[browser_focus_steal_from_chrome.js]
[browser_focus_steal_from_chrome_during_mousedown.js]
[browser_frame_elements.html]
[browser_frame_elements.js]
[browser_geolocation_privatebrowsing_page.html]
[browser_geolocation_privatebrowsing_perwindowpb.js]
[browser_localStorage_privatestorageevent.js]
[browser_xhr_sandbox.js]

10
gfx/layers/composite/APZCTreeManager.cpp
View File

@ -121,6 +121,14 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
apzc = container->GetAsyncPanZoomController();
// If the content represented by the container layer has changed (which may
// be possible because of DLBI heuristics) then we don't want to keep using
// the same old APZC for the new content. Null it out so we run through the
// code to find another one or create one.
if (apzc && !apzc->Matches(ScrollableLayerGuid(aLayersId, container->GetFrameMetrics()))) {
apzc = nullptr;
}
// If the container doesn't have an APZC already, try to find one of our
// pre-existing ones that matches. In particular, if we find an APZC whose
// ScrollableLayerGuid is the same, then we know what happened is that the
@ -159,7 +167,7 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor,
APZC_LOG("Using APZC %p for layer %p with identifiers %lld %lld\n", apzc, aLayer, aLayersId, container->GetFrameMetrics().mScrollId);
apzc->NotifyLayersUpdated(container->GetFrameMetrics(),
aIsFirstPaint && (aLayersId == aFirstPaintLayersId));
aIsFirstPaint && (aLayersId == aFirstPaintLayersId));
ScreenRect visible(container->GetFrameMetrics().mCompositionBounds);
apzc->SetLayerHitTestData(visible, aTransform, aLayer->GetTransform());

650
toolkit/devtools/server/actors/webgl.js
View File

File diff suppressed because it is too large Load Diff

2
toolkit/forgetaboutsite/test/browser/browser.ini
View File

@ -1,4 +1,4 @@
[DEFAULT]
support-files = browser_clearplugindata.html
[browser_clearplugindata.html]
[browser_clearplugindata.js]

34
widget/windows/winrt/APZController.cpp
View File

@ -83,19 +83,22 @@ GetDOMTargets(uint64_t aScrollId,
class RequestContentRepaintEvent : public nsRunnable
{
typedef mozilla::layers::FrameMetrics FrameMetrics;
typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
public:
RequestContentRepaintEvent(const FrameMetrics& aFrameMetrics,
nsIWidgetListener* aListener,
CSSIntPoint* aLastOffsetOut) :
CSSIntPoint* aLastOffsetOut,
ScrollableLayerGuid* aLastScrollId) :
mFrameMetrics(aFrameMetrics),
mWidgetListener(aListener),
mLastOffsetOut(aLastOffsetOut)
mLastOffsetOut(aLastOffsetOut),
mLastScrollIdOut(aLastScrollId)
{
}
NS_IMETHOD Run() {
// This event shuts down the worker thread and so must be main thread.
// This must be on the gecko thread since we access the dom
MOZ_ASSERT(NS_IsMainThread());
#ifdef DEBUG_CONTROLLER
@ -139,6 +142,10 @@ public:
if (mLastOffsetOut) {
*mLastOffsetOut = actualScrollOffset;
}
if (mLastScrollIdOut) {
mLastScrollIdOut->mScrollId = mFrameMetrics.mScrollId;
mLastScrollIdOut->mPresShellId = mFrameMetrics.mPresShellId;
}
#ifdef DEBUG_CONTROLLER
WinUtils::Log("APZController: %I64d mDisplayPort: %0.2f %0.2f %0.2f %0.2f",
@ -156,6 +163,7 @@ protected:
FrameMetrics mFrameMetrics;
nsIWidgetListener* mWidgetListener;
CSSIntPoint* mLastOffsetOut;
ScrollableLayerGuid* mLastScrollIdOut;
};
void
@ -225,19 +233,19 @@ APZController::ReceiveInputEvent(WidgetInputEvent* aInEvent,
void
APZController::RequestContentRepaint(const FrameMetrics& aFrameMetrics)
{
// Send the result back to the main thread so that it can shutdown
if (!mWidgetListener) {
NS_WARNING("Can't update display port, !mWidgetListener");
return;
}
#ifdef DEBUG_CONTROLLER
WinUtils::Log("APZController::RequestContentRepaint scroll id = %I64d",
WinUtils::Log("APZController::RequestContentRepaint scrollid=%I64d",
aFrameMetrics.mScrollId);
#endif
nsCOMPtr<nsIRunnable> r1 = new RequestContentRepaintEvent(aFrameMetrics,
mWidgetListener,
&mLastScrollOffset);
&mLastScrollOffset,
&mLastScrollLayerGuid);
if (!NS_IsMainThread()) {
NS_DispatchToMainThread(r1);
} else {
@ -253,12 +261,20 @@ APZController::UpdateScrollOffset(const mozilla::layers::ScrollableLayerGuid& aS
CSSIntPoint& aScrollOffset)
{
#ifdef DEBUG_CONTROLLER
WinUtils::Log("APZController::UpdateScrollOffset: %d %d == %d %d",
WinUtils::Log("APZController::UpdateScrollOffset: scrollid:%I64d == %I64d offsets: %d,%d == %d,%d",
aScrollLayerId.mScrollId, aScrollLayerId.mScrollId,
aScrollOffset.x, aScrollOffset.y,
mLastScrollOffset.x, mLastScrollOffset.y);
#endif
if (!sAPZC || mLastScrollOffset == aScrollOffset) {
// Bail if this the same scroll guid the apzc just scrolled and the offsets
// equal the offset the apzc set.
if (!sAPZC || (mLastScrollLayerGuid.mScrollId == aScrollLayerId.mScrollId &&
mLastScrollLayerGuid.mPresShellId == aScrollLayerId.mPresShellId &&
mLastScrollOffset == aScrollOffset)) {
#ifdef DEBUG_CONTROLLER
WinUtils::Log("Skipping UpdateScrollOffset");
#endif
return;
}
sAPZC->UpdateScrollOffset(aScrollLayerId, aScrollOffset);

6
widget/windows/winrt/APZController.h
View File

@ -25,6 +25,11 @@ class APZController :
typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
public:
APZController() :
mWidgetListener(nullptr)
{
}
// GeckoContentController interface
virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics);
virtual void HandleDoubleTap(const mozilla::CSSIntPoint& aPoint);
@ -54,6 +59,7 @@ public:
private:
nsIWidgetListener* mWidgetListener;
ScrollableLayerGuid mLastScrollLayerGuid;
CSSIntPoint mLastScrollOffset;
};

3
widget/windows/winrt/MetroWidget.cpp
View File

@ -1364,8 +1364,7 @@ MetroWidget::Move(double aX, double aY)
NS_IMETHODIMP
MetroWidget::Resize(double aWidth, double aHeight, bool aRepaint)
{
Resize(0, 0, aHeight, aHeight, aRepaint);
return NS_OK;
return Resize(0, 0, aWidth, aHeight, aRepaint);
}
NS_IMETHODIMP