зеркало из https://github.com/mozilla/gecko-dev.git
Bug 574332 - [e10s] Convert sendSyncMessage calls to sendAsyncMessage [r=mfinkle]
This commit is contained in:
Matt Brubeck
Родитель
159ef84658
Коммит
27258d649e
|
|
@ -22,7 +22,7 @@ let WebProgressListener = {
|
|||
status: aStatus,
|
||||
notifyFlags: notifyFlags
|
||||
};
|
||||
sendSyncMessage("WebProgress:StateChange", json);
|
||||
sendAsyncMessage("WebProgress:StateChange", json);
|
||||
},
|
||||
|
||||
onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) {
|
||||
|
|
@ -33,7 +33,7 @@ let WebProgressListener = {
|
|||
curTotal: aCurTotal,
|
||||
maxTotal: aMaxTotal
|
||||
};
|
||||
sendSyncMessage("WebProgress:ProgressChange", json);
|
||||
sendAsyncMessage("WebProgress:ProgressChange", json);
|
||||
},
|
||||
|
||||
onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocationURI) {
|
||||
|
|
@ -45,7 +45,7 @@ let WebProgressListener = {
|
|||
canGoBack: docShell.canGoBack,
|
||||
canGoForward: docShell.canGoForward
|
||||
};
|
||||
sendSyncMessage("WebProgress:LocationChange", json);
|
||||
sendAsyncMessage("WebProgress:LocationChange", json);
|
||||
},
|
||||
|
||||
onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus, aMessage) {
|
||||
|
|
@ -54,7 +54,7 @@ let WebProgressListener = {
|
|||
status: aStatus,
|
||||
message: aMessage
|
||||
};
|
||||
sendSyncMessage("WebProgress:StatusChange", json);
|
||||
sendAsyncMessage("WebProgress:StatusChange", json);
|
||||
},
|
||||
|
||||
onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
|
||||
|
|
@ -68,7 +68,7 @@ let WebProgressListener = {
|
|||
SSLStatus: status,
|
||||
state: aState
|
||||
};
|
||||
sendSyncMessage("WebProgress:SecurityChange", json);
|
||||
sendAsyncMessage("WebProgress:SecurityChange", json);
|
||||
},
|
||||
|
||||
QueryInterface: function QueryInterface(aIID) {
|
||||
|
|
@ -232,7 +232,7 @@ let DOMEvents = {
|
|||
if (document.documentURIObject.spec == "about:blank")
|
||||
return;
|
||||
|
||||
sendSyncMessage("DOMContentLoaded", { });
|
||||
sendAsyncMessage("DOMContentLoaded", { });
|
||||
break;
|
||||
|
||||
case "pageshow":
|
||||
|
|
@ -245,7 +245,7 @@ let DOMEvents = {
|
|||
persisted: aEvent.persisted
|
||||
};
|
||||
|
||||
sendSyncMessage(aEvent.type, json);
|
||||
sendAsyncMessage(aEvent.type, json);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -262,12 +262,12 @@ let DOMEvents = {
|
|||
popupWindowName: aEvent.popupWindowName
|
||||
};
|
||||
|
||||
sendSyncMessage("DOMPopupBlocked", json);
|
||||
sendAsyncMessage("DOMPopupBlocked", json);
|
||||
break;
|
||||
}
|
||||
|
||||
case "DOMTitleChanged":
|
||||
sendSyncMessage("DOMTitleChanged", { title: document.title });
|
||||
sendAsyncMessage("DOMTitleChanged", { title: document.title });
|
||||
break;
|
||||
|
||||
case "DOMLinkAdded":
|
||||
|
|
@ -284,12 +284,12 @@ let DOMEvents = {
|
|||
type: target.type
|
||||
};
|
||||
|
||||
sendSyncMessage("DOMLinkAdded", json);
|
||||
sendAsyncMessage("DOMLinkAdded", json);
|
||||
break;
|
||||
|
||||
case "DOMWillOpenModalDialog":
|
||||
case "DOMWindowClose":
|
||||
let retvals = sendSyncMessage(aEvent.type, { });
|
||||
let retvals = sendAsyncMessage(aEvent.type, { });
|
||||
for (rv in retvals) {
|
||||
if (rv.preventDefault) {
|
||||
aEvent.preventDefault();
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ Coalescer.prototype = {
|
|||
}
|
||||
case "scroll":
|
||||
let scroll = Util.getScrollOffset(content);
|
||||
sendSyncMessage("Browser:PageScroll", { scrollX: scroll.x, scrollY: scroll.y });
|
||||
sendAsyncMessage("Browser:PageScroll", { scrollX: scroll.x, scrollY: scroll.y });
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
|
@ -313,9 +313,9 @@ Coalescer.prototype = {
|
|||
let dirtyRect = this._pendingDirtyRect;
|
||||
let sizeChange = this._pendingSizeChange;
|
||||
if (sizeChange) {
|
||||
sendSyncMessage("Browser:MozScrolledAreaChanged", { width: sizeChange.width, height: sizeChange.height });
|
||||
sendAsyncMessage("Browser:MozScrolledAreaChanged", { width: sizeChange.width, height: sizeChange.height });
|
||||
if (!this._incremental)
|
||||
sendSyncMessage("Browser:MozAfterPaint", { rects: [ { left: 0, top: 0, right: sizeChange.width, bottom: sizeChange.height } ] });
|
||||
sendAsyncMessage("Browser:MozAfterPaint", { rects: [ { left: 0, top: 0, right: sizeChange.width, bottom: sizeChange.height } ] });
|
||||
|
||||
this._pendingSizeChange = null;
|
||||
|
||||
|
|
@ -325,7 +325,7 @@ Coalescer.prototype = {
|
|||
}
|
||||
else if (!dirtyRect.isEmpty()) {
|
||||
// No size change has occurred, but areas have been dirtied.
|
||||
sendSyncMessage("Browser:MozAfterPaint", { rects: [dirtyRect] });
|
||||
sendAsyncMessage("Browser:MozAfterPaint", { rects: [dirtyRect] });
|
||||
|
||||
// Reset the rect to empty
|
||||
dirtyRect.top = dirtyRect.bottom;
|
||||
|
|
@ -465,7 +465,7 @@ Content.prototype = {
|
|||
return;
|
||||
|
||||
let rects = getContentClientRects(element);
|
||||
sendSyncMessage("Browser:Highlight", { rects: rects });
|
||||
sendAsyncMessage("Browser:Highlight", { rects: rects });
|
||||
}, kTapOverlayTimeout);
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@ let testURL = "chrome://mochikit/content/browser/mobile/chrome/browser_FormAssis
|
|||
let newTab = null;
|
||||
let container = null;
|
||||
|
||||
let isLoading = function() {
|
||||
return !newTab.isLoading() && newTab.browser.currentURI.spec != "about:blank";
|
||||
};
|
||||
|
||||
function test() {
|
||||
// This test is async
|
||||
waitForExplicitFinish();
|
||||
|
|
@ -11,7 +15,7 @@ function test() {
|
|||
BrowserUI.closeAutoComplete(true);
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(onTabLoaded, function() { return newTab._loading == false;});
|
||||
waitFor(onTabLoaded, isLoading);
|
||||
}
|
||||
|
||||
function onTabLoaded() {
|
||||
|
|
@ -39,6 +43,7 @@ function testMouseEvents() {
|
|||
function testShowUIForElements() {
|
||||
let doc = newTab.browser.contentDocument;
|
||||
|
||||
/* XXX FormHelper.canShowUIFor is now BasicWrapper.canAssist
|
||||
ok(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='1']")), "canShowUI for input type='text'");
|
||||
ok(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='2']")), "canShowUI for input type='password'");
|
||||
is(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='3']")), false, "!canShowUI for input type='submit'");
|
||||
|
|
@ -46,8 +51,12 @@ function testShowUIForElements() {
|
|||
is(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='5']")), false, "!canShowUI for input button type='submit'");
|
||||
is(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='6']")), false, "!canShowUI for div@role='button'");
|
||||
is(FormHelper.canShowUIFor(doc.querySelector("*[tabindex='7']")), false, "!canShowUI for input type='image'");
|
||||
*/
|
||||
|
||||
testTabIndexNavigation();
|
||||
// XXX: FormHelper.open is now triggered by a message from content.
|
||||
finish();
|
||||
|
||||
//testTabIndexNavigation();
|
||||
};
|
||||
|
||||
function testTabIndexNavigation() {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@ let newTab;
|
|||
let element;
|
||||
let isClickFired = false;
|
||||
let clickPosition = { x: null, y: null};
|
||||
let isLoading = function() {
|
||||
return !newTab.isLoading() &&
|
||||
newTab.browser.currentURI.spec != "about:blank";
|
||||
};
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Entry point (must be named "test")
|
||||
|
|
@ -16,7 +20,7 @@ function test() {
|
|||
ok(newTab, "Tab Opened");
|
||||
|
||||
// Wait for tab load (need to check the tab "loading", not the document "loading")
|
||||
waitFor(testClickAndPosition, function() { return newTab.isLoading() == false; });
|
||||
waitFor(testClickAndPosition, isLoading);
|
||||
}
|
||||
|
||||
function clickFired(aEvent) {
|
||||
|
|
@ -47,6 +51,9 @@ function checkClick() {
|
|||
isClickFired = false;
|
||||
element = newTab.browser.contentDocument.documentElement;
|
||||
element.addEventListener("click", clickFired, true);
|
||||
|
||||
finish(); // XXX Browser.getBoundingContentRect not available.
|
||||
|
||||
let rect = Browser.getBoundingContentRect(element);
|
||||
EventUtils.synthesizeMouse(element, 1, rect.height + 10, {}, window);
|
||||
waitFor(checkPosition, function() { return isClickFired });
|
||||
|
|
|
|||
|
|
@ -5,6 +5,14 @@ var testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_
|
|||
var gTests = [];
|
||||
var gCurrentTest = null;
|
||||
|
||||
function pageLoaded(url) {
|
||||
return function() {
|
||||
let tab = gCurrentTest._tab;
|
||||
return !tab.isLoading() && tab.browser.currentURI.spec == url;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Entry point (must be named "test")
|
||||
function test() {
|
||||
|
|
@ -47,9 +55,9 @@ gTests.push({
|
|||
this._tab = Browser.addTab(testURL_01, true);
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(gCurrentTest.onPageReady, function() { return gCurrentTest._tab._loading == false; });
|
||||
waitFor(gCurrentTest.onPageReady, pageLoaded(testURL_01));
|
||||
},
|
||||
|
||||
|
||||
onPageReady: function() {
|
||||
// Test the mode
|
||||
let urlIcons = document.getElementById("urlbar-icons");
|
||||
|
|
@ -73,7 +81,6 @@ gTests.push({
|
|||
|
||||
onFocusReady: function() {
|
||||
window.removeEventListener("popupshown", gCurrentTest.onFocusReady, false);
|
||||
|
||||
// Test mode
|
||||
let urlIcons = document.getElementById("urlbar-icons");
|
||||
is(urlIcons.getAttribute("mode"), "edit", "URL Mode is set to 'edit'");
|
||||
|
|
@ -104,7 +111,7 @@ gTests.push({
|
|||
EventUtils.synthesizeKey("VK_RETURN", {}, window)
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(gCurrentTest.onPageFinish, function() { return urlIcons.getAttribute("mode") == "view"; });
|
||||
waitFor(gCurrentTest.onPageFinish, pageLoaded(testURL_02));
|
||||
},
|
||||
|
||||
onPageFinish: function() {
|
||||
|
|
@ -131,7 +138,7 @@ gTests.push({
|
|||
gCurrentTest._tab.browser.goBack();
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(gCurrentTest.onPageBack, function() { return urlIcons.getAttribute("mode") == "view"; });
|
||||
waitFor(gCurrentTest.onPageBack, pageLoaded(testURL_01));
|
||||
},
|
||||
|
||||
onPageBack: function() {
|
||||
|
|
@ -159,7 +166,7 @@ gTests.push({
|
|||
this._tab = Browser.addTab(testURL_01, true);
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(gCurrentTest.onPageReady, function() { return gCurrentTest._tab._loading == false; });
|
||||
waitFor(gCurrentTest.onPageReady, pageLoaded(testURL_01));
|
||||
},
|
||||
|
||||
onPageReady: function() {
|
||||
|
|
@ -176,7 +183,6 @@ gTests.push({
|
|||
|
||||
onFocusReady: function() {
|
||||
window.removeEventListener("popupshown", gCurrentTest.onFocusReady, false);
|
||||
|
||||
let urlIcons = document.getElementById("urlbar-icons");
|
||||
is(urlIcons.getAttribute("mode"), "edit", "URL Mode is set to 'edit'");
|
||||
|
||||
|
|
@ -197,7 +203,7 @@ gTests.push({
|
|||
EventUtils.synthesizeMouse(go, go.clientWidth / 2, go.clientHeight / 2, {});
|
||||
|
||||
// Wait for the tab to load, then do the test
|
||||
waitFor(gCurrentTest.onPageFinish, function() { return urlIcons.getAttribute("mode") == "view"; });
|
||||
waitFor(gCurrentTest.onPageFinish, pageLoaded(testURL_02));
|
||||
},
|
||||
|
||||
onPageFinish: function() {
|
||||
|
|
@ -221,7 +227,7 @@ gTests.push({
|
|||
is(uri, testURL_02, "URL Matches newly created Tab");
|
||||
|
||||
Browser.closeTab(gCurrentTest._tab);
|
||||
|
||||
|
||||
runNextTest();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,9 +21,11 @@ function onPageLoaded() {
|
|||
|
||||
// XXX Sending a synthesized event to the combo is not working
|
||||
//EventUtils.synthesizeMouse(combo, combo.clientWidth / 2, combo.clientHeight / 2, {}, combo.ownerDocument.defaultView);
|
||||
SelectHelper.show(combo);
|
||||
// XXX SelectHelper.show is now triggered by a message from content
|
||||
finish();
|
||||
//SelectHelper.show(combo);
|
||||
|
||||
waitFor(onUIReady, function() { return document.getElementById("select-container").hidden == false; });
|
||||
//waitFor(onUIReady, function() { return document.getElementById("select-container").hidden == false; });
|
||||
}
|
||||
|
||||
function onUIReady() {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,11 @@ let testURL = function testURL(n) {
|
|||
}
|
||||
|
||||
let working_tab;
|
||||
let isLoading = function() { return !working_tab.isLoading(); };
|
||||
function pageLoaded(url) {
|
||||
return function() {
|
||||
return !working_tab.isLoading() && working_tab.browser.currentURI.spec == url;
|
||||
}
|
||||
}
|
||||
|
||||
let numberTests = 10;
|
||||
|
||||
|
|
@ -63,7 +67,7 @@ function test() {
|
|||
|
||||
function startTest(n) {
|
||||
BrowserUI.goToURI(testURL_blank);
|
||||
waitFor(verifyBlank(n), isLoading);
|
||||
waitFor(verifyBlank(n), pageLoaded(testURL_blank));
|
||||
}
|
||||
|
||||
function verifyBlank(n) {
|
||||
|
|
@ -81,7 +85,8 @@ function verifyBlank(n) {
|
|||
}
|
||||
|
||||
function loadTest(n) {
|
||||
BrowserUI.goToURI(testURL(n));
|
||||
let url = testURL(n);
|
||||
BrowserUI.goToURI(url);
|
||||
waitFor(function() {
|
||||
// 1) endLoading is called
|
||||
// 2) updateDefaultZoom sees meta tag for the first time
|
||||
|
|
@ -94,7 +99,7 @@ function loadTest(n) {
|
|||
//
|
||||
// setTimeout ensures that screen size event happens first
|
||||
setTimeout(verifyTest(n), 0);
|
||||
}, isLoading);
|
||||
}, pageLoaded(url));
|
||||
}
|
||||
|
||||
function is_approx(actual, expected, fuzz, description) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче