forked from Floorp-Projects/Floorp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1068412: Forward dynamically registered resource URI mappings to …
…content processes. r=billm
- Loading branch information
Showing
8 changed files
with
280 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,6 +71,7 @@ union ChromeRegistryItem | |
| { | ||
| ChromePackage; | ||
| OverrideMapping; | ||
| ResourceMapping; | ||
| }; | ||
|
|
||
| namespace mozilla { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| [DEFAULT] | ||
| support-files = | ||
| dummy.html | ||
|
|
||
| [browser_NetUtil.js] | ||
| [browser_child_resource.js] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,213 @@ | ||
| /* | ||
| Any copyright is dedicated to the Public Domain. | ||
| http://creativecommons.org/publicdomain/zero/1.0/ | ||
| */ | ||
|
|
||
| // This must be loaded in the remote process for this test to be useful | ||
| const TEST_URL = "http://example.com/browser/netwerk/test/browser/dummy.html"; | ||
|
|
||
| const expectedRemote = gMultiProcessBrowser ? "true" : ""; | ||
|
|
||
| Components.utils.import("resource://gre/modules/Services.jsm"); | ||
| const resProtocol = Cc["@mozilla.org/network/protocol;1?name=resource"] | ||
| .getService(Ci.nsIResProtocolHandler); | ||
|
|
||
| function frameScript() { | ||
| Components.utils.import("resource://gre/modules/Services.jsm"); | ||
| let resProtocol = Components.classes["@mozilla.org/network/protocol;1?name=resource"] | ||
| .getService(Components.interfaces.nsIResProtocolHandler); | ||
|
|
||
| addMessageListener("Test:ResolveURI", function({ data: uri }) { | ||
| uri = Services.io.newURI(uri, null, null); | ||
| try { | ||
| let resolved = resProtocol.resolveURI(uri); | ||
| sendAsyncMessage("Test:ResolvedURI", resolved); | ||
| } | ||
| catch (e) { | ||
| sendAsyncMessage("Test:ResolvedURI", null); | ||
| } | ||
| }); | ||
|
|
||
| addMessageListener("Test:Crash", function() { | ||
| dump("Crashing\n"); | ||
| privateNoteIntentionalCrash(); | ||
| Components.utils.import("resource://gre/modules/ctypes.jsm"); | ||
| let zero = new ctypes.intptr_t(8); | ||
| let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t)); | ||
| badptr.contents | ||
| }); | ||
| } | ||
|
|
||
| function waitForEvent(obj, name, capturing, chromeEvent) { | ||
| info("Waiting for " + name); | ||
| return new Promise((resolve) => { | ||
| function listener(event) { | ||
| info("Saw " + name); | ||
| obj.removeEventListener(name, listener, capturing, chromeEvent); | ||
| resolve(event); | ||
| } | ||
|
|
||
| obj.addEventListener(name, listener, capturing, chromeEvent); | ||
| }); | ||
| } | ||
|
|
||
| function resolveURI(uri) { | ||
| uri = Services.io.newURI(uri, null, null); | ||
| try { | ||
| return resProtocol.resolveURI(uri); | ||
| } | ||
| catch (e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| function remoteResolveURI(uri) { | ||
| return new Promise((resolve) => { | ||
| let manager = gBrowser.selectedBrowser.messageManager; | ||
|
|
||
| function listener({ data: resolved }) { | ||
| manager.removeMessageListener("Test:ResolvedURI", listener); | ||
| resolve(resolved); | ||
| } | ||
|
|
||
| manager.addMessageListener("Test:ResolvedURI", listener); | ||
| manager.sendAsyncMessage("Test:ResolveURI", uri); | ||
| }); | ||
| } | ||
|
|
||
| let loadTestTab = Task.async(function*() { | ||
| gBrowser.selectedTab = gBrowser.addTab(TEST_URL); | ||
| let browser = gBrowser.selectedBrowser; | ||
| yield waitForEvent(browser, "load", true); | ||
| browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")();", true); | ||
| return browser; | ||
| }); | ||
|
|
||
| // Restarts the child process by crashing it then reloading the tab | ||
| let restart = Task.async(function*() { | ||
| let browser = gBrowser.selectedBrowser; | ||
| // If the tab isn't remote this would crash the main process so skip it | ||
| if (browser.getAttribute("remote") != "true") | ||
| return browser; | ||
|
|
||
| browser.messageManager.sendAsyncMessage("Test:Crash"); | ||
| yield waitForEvent(browser, "AboutTabCrashedLoad", false, true); | ||
|
|
||
| browser.reload(); | ||
|
|
||
| yield waitForEvent(browser, "load", true); | ||
| is(browser.getAttribute("remote"), expectedRemote, "Browser should be in the right process"); | ||
| browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")();", true); | ||
| return browser; | ||
| }); | ||
|
|
||
| // Sanity check that this test is going to be useful | ||
| add_task(function*() { | ||
| let browser = yield loadTestTab(); | ||
|
|
||
| // This must be loaded in the remote process for this test to be useful | ||
| is(browser.getAttribute("remote"), expectedRemote, "Browser should be in the right process"); | ||
|
|
||
| let local = resolveURI("resource://gre/modules/Services.jsm"); | ||
| let remote = yield remoteResolveURI("resource://gre/modules/Services.jsm"); | ||
| is(local, remote, "Services.jsm should resolve in both processes"); | ||
|
|
||
| gBrowser.removeCurrentTab(); | ||
| }); | ||
|
|
||
| // Add a mapping, update it then remove it | ||
| add_task(function*() { | ||
| let browser = yield loadTestTab(); | ||
|
|
||
| info("Set"); | ||
| resProtocol.setSubstitution("testing", Services.io.newURI("chrome://global/content", null, null)); | ||
| let local = resolveURI("resource://testing/test.js"); | ||
| let remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, "chrome://global/content/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/content/test.js", "Should resolve in child process"); | ||
|
|
||
| info("Change"); | ||
| resProtocol.setSubstitution("testing", Services.io.newURI("chrome://global/skin", null, null)); | ||
| local = resolveURI("resource://testing/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, "chrome://global/skin/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/skin/test.js", "Should resolve in child process"); | ||
|
|
||
| info("Clear"); | ||
| resProtocol.setSubstitution("testing", null); | ||
| local = resolveURI("resource://testing/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, null, "Shouldn't resolve in main process"); | ||
| is(remote, null, "Shouldn't resolve in child process"); | ||
|
|
||
| gBrowser.removeCurrentTab(); | ||
| }); | ||
|
|
||
| // Add a mapping, restart the child process then check it is still there | ||
| add_task(function*() { | ||
| let browser = yield loadTestTab(); | ||
|
|
||
| info("Set"); | ||
| resProtocol.setSubstitution("testing", Services.io.newURI("chrome://global/content", null, null)); | ||
| let local = resolveURI("resource://testing/test.js"); | ||
| let remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, "chrome://global/content/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/content/test.js", "Should resolve in child process"); | ||
|
|
||
| yield restart(); | ||
|
|
||
| local = resolveURI("resource://testing/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, "chrome://global/content/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/content/test.js", "Should resolve in child process"); | ||
|
|
||
| info("Change"); | ||
| resProtocol.setSubstitution("testing", Services.io.newURI("chrome://global/skin", null, null)); | ||
|
|
||
| yield restart(); | ||
|
|
||
| local = resolveURI("resource://testing/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, "chrome://global/skin/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/skin/test.js", "Should resolve in child process"); | ||
|
|
||
| info("Clear"); | ||
| resProtocol.setSubstitution("testing", null); | ||
|
|
||
| yield restart(); | ||
|
|
||
| local = resolveURI("resource://testing/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing/test.js"); | ||
| is(local, null, "Shouldn't resolve in main process"); | ||
| is(remote, null, "Shouldn't resolve in child process"); | ||
|
|
||
| gBrowser.removeCurrentTab(); | ||
| }); | ||
|
|
||
| // Adding a mapping to a resource URI should work | ||
| add_task(function*() { | ||
| let browser = yield loadTestTab(); | ||
|
|
||
| info("Set"); | ||
| resProtocol.setSubstitution("testing", Services.io.newURI("chrome://global/content", null, null)); | ||
| resProtocol.setSubstitution("testing2", Services.io.newURI("resource://testing", null, null)); | ||
| let local = resolveURI("resource://testing2/test.js"); | ||
| let remote = yield remoteResolveURI("resource://testing2/test.js"); | ||
| is(local, "chrome://global/content/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/content/test.js", "Should resolve in child process"); | ||
|
|
||
| info("Clear"); | ||
| resProtocol.setSubstitution("testing", null); | ||
| local = resolveURI("resource://testing2/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing2/test.js"); | ||
| is(local, "chrome://global/content/test.js", "Should resolve in main process"); | ||
| is(remote, "chrome://global/content/test.js", "Should resolve in child process"); | ||
|
|
||
| resProtocol.setSubstitution("testing2", null); | ||
| local = resolveURI("resource://testing2/test.js"); | ||
| remote = yield remoteResolveURI("resource://testing2/test.js"); | ||
| is(local, null, "Shouldn't resolve in main process"); | ||
| is(remote, null, "Shouldn't resolve in child process"); | ||
|
|
||
| gBrowser.removeCurrentTab(); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <!DOCTYPE html> | ||
|
|
||
| <html> | ||
| <body> | ||
| <p>Dummy Page</p> | ||
| </body> | ||
| </html> |