diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index dceafbea9947..24d11310af6c 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -816,11 +816,7 @@ pref("network.sntp.port", 123); pref("network.sntp.timeout", 30); // In seconds. // Enable dataStore -#ifdef RELEASE_BUILD -pref("dom.datastore.enabled", false); -#else pref("dom.datastore.enabled", true); -#endif // DOM Inter-App Communication API. pref("dom.inter-app-communication-api.enabled", true); diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css index ffd39bdc2789..23f1d593238a 100644 --- a/b2g/chrome/content/content.css +++ b/b2g/chrome/content/content.css @@ -10,13 +10,16 @@ xul|window xul|scrollbar { display: none; } +html xul|scrollbar[root="true"] { + position: relative; + z-index: 2147483647; +} + html xul|scrollbar { -moz-appearance: none !important; - position: relative; background-color: transparent !important; background-image: none !important; border: 0px solid transparent !important; - z-index: 2147483647; pointer-events: none; opacity: 1; } diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index 0ee816b962f7..e7c5a46184b1 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -751,6 +751,10 @@ var CustomEventManager = { case 'inputmethod-update-layouts': KeyboardHelper.handleEvent(detail); break; + case 'nfc-hardware-state-change': + Services.obs.notifyObservers(null, 'nfc-hardware-state-change', + JSON.stringify({ nfcHardwareState: detail.nfcHardwareState })); + break; } } } diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7adfde8eaf5e..64a385ecd51c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d4b146d9e455..fbef08ecd7d9 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7adfde8eaf5e..64a385ecd51c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b3519e0585d3..fab6f957e938 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b82f9138def9e1b0ce69667ca29069cd8b785d5e", + "revision": "34a411a6261587124fc6746fb18a19c05571437a", "repo_path": "/integration/gaia-central" } diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c739cf775af0..7763aafea72a 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 44639ef93c3d..38d7d7dca3d0 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9b6fc34c58c1..e77e09b5c1a9 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 4727df25c42b..cfae3ec151ef 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 8d5b609351f5..6868b0ea0fb3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e25a53cbf198..83b1a8366c46 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 6d3f8af27cda..0d0515b98bfd 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -241,6 +241,7 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory) // relaunches Metro Firefox with this command line arg. mainFlags = XRE_MAIN_FLAG_USE_METRO; } else { +#ifndef RELEASE_BUILD // This command-line flag is used to test the metro browser in a desktop // environment. for (int idx = 1; idx < argc; idx++) { @@ -252,6 +253,7 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory) break; } } +#endif } } #endif @@ -298,13 +300,6 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory) return 255; } - char appEnv[MAXPATHLEN]; - snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", path.get()); - if (putenv(appEnv)) { - Output("Couldn't set %s.\n", appEnv); - return 255; - } - nsXREAppData *appData; rv = XRE_CreateAppData(iniFile, &appData); if (NS_FAILED(rv) || !appData) { diff --git a/browser/base/content/aboutaccounts/main.css b/browser/base/content/aboutaccounts/main.css index 70f7b97ab5a0..9678e43a63e9 100644 --- a/browser/base/content/aboutaccounts/main.css +++ b/browser/base/content/aboutaccounts/main.css @@ -1,7 +1,5 @@ /* Border box all the things by default */ *, *:before, *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; box-sizing: border-box; } diff --git a/browser/base/content/aboutaccounts/normalize.css b/browser/base/content/aboutaccounts/normalize.css index f9180c151c4d..c02ab25de498 100644 --- a/browser/base/content/aboutaccounts/normalize.css +++ b/browser/base/content/aboutaccounts/normalize.css @@ -150,7 +150,6 @@ dfn { */ hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -351,15 +350,12 @@ input[type="radio"] { /** * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome. */ input[type="search"] { -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; + box-sizing: content-box; /* 2 */ } /** diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 7533c5abb122..bb4dc542c1d4 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -852,7 +852,7 @@ chatbox:-moz-full-screen-ancestor { max-width: none !important; min-height: 0 !important; max-height: none !important; - -moz-box-sizing: border-box !important; + box-sizing: border-box !important; } /* hide chat chrome when chat is fullscreen */ diff --git a/browser/components/sessionstore/src/SessionHistory.jsm b/browser/components/sessionstore/src/SessionHistory.jsm index 43556a9a675d..334c572be92e 100644 --- a/browser/components/sessionstore/src/SessionHistory.jsm +++ b/browser/components/sessionstore/src/SessionHistory.jsm @@ -184,6 +184,9 @@ let SessionHistoryInternal = { if (shEntry.isSrcdocEntry) entry.isSrcdocEntry = shEntry.isSrcdocEntry; + if (shEntry.baseURI) + entry.baseURI = shEntry.baseURI; + if (shEntry.contentType) entry.contentType = shEntry.contentType; @@ -328,6 +331,8 @@ let SessionHistoryInternal = { shEntry.referrerURI = Utils.makeURI(entry.referrer); if (entry.isSrcdocEntry) shEntry.srcdocData = entry.srcdocData; + if (entry.baseURI) + shEntry.baseURI = entry.baseURI; if (entry.cacheKey) { var cacheKey = Cc["@mozilla.org/supports-PRUint32;1"]. diff --git a/browser/devtools/layoutview/view.css b/browser/devtools/layoutview/view.css index 8863a1ddb4ad..a7f77fd50752 100644 --- a/browser/devtools/layoutview/view.css +++ b/browser/devtools/layoutview/view.css @@ -14,7 +14,7 @@ body { } #header { - -moz-box-sizing: border-box; + box-sizing: border-box; width: 100%; padding: 6px 9px; display: -moz-box; @@ -39,7 +39,7 @@ body { #main { margin: 0 10px 10px 10px; - -moz-box-sizing: border-box; + box-sizing: border-box; width: calc(100% - 2 * 10px); position: absolute; border-width: 1px; diff --git a/browser/devtools/profiler/cleopatra/css/ui.css b/browser/devtools/profiler/cleopatra/css/ui.css index a0e5bb6be1cf..bb9b63ca31dc 100755 --- a/browser/devtools/profiler/cleopatra/css/ui.css +++ b/browser/devtools/profiler/cleopatra/css/ui.css @@ -203,7 +203,6 @@ body { white-space:pre; } .sideBar { - -moz-box-sizing: border-box; box-sizing: border-box; position: absolute; left: 0; diff --git a/browser/devtools/sourceeditor/codemirror/codemirror.css b/browser/devtools/sourceeditor/codemirror/codemirror.css index 90bcc5c33ee3..5b18a57e5990 100644 --- a/browser/devtools/sourceeditor/codemirror/codemirror.css +++ b/browser/devtools/sourceeditor/codemirror/codemirror.css @@ -118,7 +118,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} height: 100%; outline: none; /* Prevent dragging from highlighting the element */ position: relative; - -moz-box-sizing: content-box; box-sizing: content-box; } .CodeMirror-sizer { @@ -158,7 +157,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} .CodeMirror-gutter { white-space: normal; height: 100%; - -moz-box-sizing: content-box; box-sizing: content-box; padding-bottom: 30px; margin-bottom: -32px; diff --git a/browser/extensions/pdfjs/content/web/viewer.css b/browser/extensions/pdfjs/content/web/viewer.css index e9b560deb1b0..88e3783b214a 100644 --- a/browser/extensions/pdfjs/content/web/viewer.css +++ b/browser/extensions/pdfjs/content/web/viewer.css @@ -838,7 +838,6 @@ html[dir="rtl"] .secondaryToolbarButton.print::before { .toolbarButton.bookmark, .secondaryToolbarButton.bookmark { - -moz-box-sizing: border-box; box-sizing: border-box; outline: none; padding-top: 4px; diff --git a/browser/metro/theme/config.css b/browser/metro/theme/config.css index 2374f237a9bc..5a6f9e048932 100644 --- a/browser/metro/theme/config.css +++ b/browser/metro/theme/config.css @@ -68,7 +68,7 @@ body { display: inline-block; height: 100%; min-width: 3em; - -moz-box-sizing: border-box; + box-sizing: border-box; opacity: 0.75; } @@ -132,7 +132,7 @@ ul { padding-top: 0; margin: 0; padding-left: 0; - -moz-box-sizing: border-box; + box-sizing: border-box; box-shadow: 0 0 5px #000000; overflow-x: hidden; } @@ -141,7 +141,7 @@ ul { width: 100%; margin: 0; background-color: #ffffff; - -moz-box-sizing: border-box; + box-sizing: border-box; box-shadow: 0 0 5px #000000; overflow-x: hidden; max-width: 40em; @@ -270,7 +270,7 @@ li { .pref-button { display: inline-block; - -moz-box-sizing: border-box; + box-sizing: border-box; text-align: center; padding: 10px 1em; border-left: 1px solid rgba(0,0,0,0.1); diff --git a/browser/metro/theme/tiles.css b/browser/metro/theme/tiles.css index f46f36849da6..2910cc012f2f 100644 --- a/browser/metro/theme/tiles.css +++ b/browser/metro/theme/tiles.css @@ -45,7 +45,7 @@ richgrid > .richgrid-grid { -moz-column-gap: 0; -moz-column-count: auto; display: block; - -moz-box-sizing: content-box; + box-sizing: content-box; overflow-x: hidden; /* clipping will only kick in if an explicit width is set */ transition: 100ms transform ease-out; } @@ -60,7 +60,7 @@ richgriditem { position: relative; width: @grid_double_column_width@; height: @grid_row_height@; - -moz-box-sizing: border-box; + box-sizing: border-box; -moz-column-gap: 0; overflow:hidden; cursor: default; diff --git a/browser/themes/linux/devtools/computedview.css b/browser/themes/linux/devtools/computedview.css index aa9356fcc9d9..de7ab6929e31 100644 --- a/browser/themes/linux/devtools/computedview.css +++ b/browser/themes/linux/devtools/computedview.css @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } :root { diff --git a/browser/themes/linux/devtools/font-inspector.css b/browser/themes/linux/devtools/font-inspector.css index 4b1ff84fe620..fd3deefc1856 100644 --- a/browser/themes/linux/devtools/font-inspector.css +++ b/browser/themes/linux/devtools/font-inspector.css @@ -1,5 +1,5 @@ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } body { diff --git a/browser/themes/linux/devtools/layoutview.css b/browser/themes/linux/devtools/layoutview.css index 70e02e690b6b..dcb78e40121f 100644 --- a/browser/themes/linux/devtools/layoutview.css +++ b/browser/themes/linux/devtools/layoutview.css @@ -12,7 +12,7 @@ .theme-body { color: hsl(210,100%,85%) !important; - -moz-box-sizing: border-box; + box-sizing: border-box; } #main { diff --git a/browser/themes/osx/devtools/computedview.css b/browser/themes/osx/devtools/computedview.css index fdd03acb632b..1eb1d1757040 100644 --- a/browser/themes/osx/devtools/computedview.css +++ b/browser/themes/osx/devtools/computedview.css @@ -22,7 +22,7 @@ /* From content */ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } :root { diff --git a/browser/themes/osx/devtools/font-inspector.css b/browser/themes/osx/devtools/font-inspector.css index 4b1ff84fe620..fd3deefc1856 100644 --- a/browser/themes/osx/devtools/font-inspector.css +++ b/browser/themes/osx/devtools/font-inspector.css @@ -1,5 +1,5 @@ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } body { diff --git a/browser/themes/osx/devtools/layoutview.css b/browser/themes/osx/devtools/layoutview.css index 70e02e690b6b..dcb78e40121f 100644 --- a/browser/themes/osx/devtools/layoutview.css +++ b/browser/themes/osx/devtools/layoutview.css @@ -12,7 +12,7 @@ .theme-body { color: hsl(210,100%,85%) !important; - -moz-box-sizing: border-box; + box-sizing: border-box; } #main { diff --git a/browser/themes/shared/devtools/app-manager/connection-footer.css b/browser/themes/shared/devtools/app-manager/connection-footer.css index 04fa308b52df..cee5c9887ba4 100644 --- a/browser/themes/shared/devtools/app-manager/connection-footer.css +++ b/browser/themes/shared/devtools/app-manager/connection-footer.css @@ -78,7 +78,7 @@ body.edit-connection #banner-editing { * { margin: 0; padding: 0; - -moz-box-sizing: border-box; + box-sizing: border-box; font-size: 0.9rem; } diff --git a/browser/themes/shared/devtools/app-manager/device.css b/browser/themes/shared/devtools/app-manager/device.css index 7ee3e20145cb..a63a8fc52e97 100644 --- a/browser/themes/shared/devtools/app-manager/device.css +++ b/browser/themes/shared/devtools/app-manager/device.css @@ -7,7 +7,7 @@ * { margin: 0; padding: 0; - -moz-box-sizing: border-box; + box-sizing: border-box; } html, body { diff --git a/browser/themes/shared/devtools/app-manager/index.css b/browser/themes/shared/devtools/app-manager/index.css index d0f2508b9222..cb3f87662072 100644 --- a/browser/themes/shared/devtools/app-manager/index.css +++ b/browser/themes/shared/devtools/app-manager/index.css @@ -5,7 +5,7 @@ * { margin: 0; padding: 0; - -moz-box-sizing: border-box; + box-sizing: border-box; font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif; } diff --git a/browser/themes/shared/devtools/app-manager/projects.css b/browser/themes/shared/devtools/app-manager/projects.css index 9068bc6668dc..78b9af4aecff 100644 --- a/browser/themes/shared/devtools/app-manager/projects.css +++ b/browser/themes/shared/devtools/app-manager/projects.css @@ -5,7 +5,7 @@ * { margin: 0; padding: 0; - -moz-box-sizing: border-box; + box-sizing: border-box; font-size: 0.9rem; } diff --git a/browser/themes/windows/devtools/computedview.css b/browser/themes/windows/devtools/computedview.css index fdd03acb632b..1eb1d1757040 100644 --- a/browser/themes/windows/devtools/computedview.css +++ b/browser/themes/windows/devtools/computedview.css @@ -22,7 +22,7 @@ /* From content */ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } :root { diff --git a/browser/themes/windows/devtools/font-inspector.css b/browser/themes/windows/devtools/font-inspector.css index 4b1ff84fe620..fd3deefc1856 100644 --- a/browser/themes/windows/devtools/font-inspector.css +++ b/browser/themes/windows/devtools/font-inspector.css @@ -1,5 +1,5 @@ * { - -moz-box-sizing: border-box; + box-sizing: border-box; } body { diff --git a/browser/themes/windows/devtools/layoutview.css b/browser/themes/windows/devtools/layoutview.css index 70e02e690b6b..dcb78e40121f 100644 --- a/browser/themes/windows/devtools/layoutview.css +++ b/browser/themes/windows/devtools/layoutview.css @@ -12,7 +12,7 @@ .theme-body { color: hsl(210,100%,85%) !important; - -moz-box-sizing: border-box; + box-sizing: border-box; } #main { diff --git a/config/config.mk b/config/config.mk index 4251fd092bf4..74e3dfad6608 100644 --- a/config/config.mk +++ b/config/config.mk @@ -415,6 +415,9 @@ endif endif # MOZ_PROFILE_USE endif # NO_PROFILE_GUIDED_OPTIMIZE +ifdef _MSC_VER +OS_LDFLAGS += $(DELAYLOAD_LDFLAGS) +endif # _MSC_VER # Does the makefile specifies the internal XPCOM API linkage? ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY)) diff --git a/config/rules.mk b/config/rules.mk index a1850fc24a20..77f4fbfcd8e1 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -530,6 +530,12 @@ ifeq ($(OS_ARCH),GNU) OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 endif +ifeq ($(OS_ARCH),WINNT) +ifdef USE_DELAYIMP +OS_LIBS += $(call EXPAND_LIBNAME,delayimp) +endif +endif + # # MINGW32 # diff --git a/configure.in b/configure.in index ab4da9c26d30..208e18d46a61 100644 --- a/configure.in +++ b/configure.in @@ -71,7 +71,7 @@ GCONF_VERSION=1.2.1 GIO_VERSION=2.20 STARTUP_NOTIFICATION_VERSION=0.8 DBUS_VERSION=0.60 -SQLITE_VERSION=3.8.2 +SQLITE_VERSION=3.8.3 MSMANIFEST_TOOL= diff --git a/content/base/src/EventSource.cpp b/content/base/src/EventSource.cpp index 9ce7073a7029..3659ae6ee8e3 100644 --- a/content/base/src/EventSource.cpp +++ b/content/base/src/EventSource.cpp @@ -665,7 +665,7 @@ EventSource::GetInterface(const nsIID & aIID, // static bool -EventSource::PrefEnabled() +EventSource::PrefEnabled(JSContext* aCx, JSObject* aGlobal) { return Preferences::GetBool("dom.server-events.enabled", false); } diff --git a/content/base/src/EventSource.h b/content/base/src/EventSource.h index ebf13fda0050..2997bbe15d77 100644 --- a/content/base/src/EventSource.h +++ b/content/base/src/EventSource.h @@ -98,7 +98,7 @@ public: void Close(); // Determine if preferences allow EventSource - static bool PrefEnabled(); + static bool PrefEnabled(JSContext* aCx = nullptr, JSObject* aGlobal = nullptr); virtual void DisconnectFromOwner() MOZ_OVERRIDE; diff --git a/content/base/src/ShadowRoot.cpp b/content/base/src/ShadowRoot.cpp index 4ec162695081..f12b8405e17d 100644 --- a/content/base/src/ShadowRoot.cpp +++ b/content/base/src/ShadowRoot.cpp @@ -234,12 +234,6 @@ ShadowRoot::GetElementsByClassName(const nsAString& aClasses) return nsContentUtils::GetElementsByClassName(this, aClasses); } -bool -ShadowRoot::PrefEnabled() -{ - return Preferences::GetBool("dom.webcomponents.enabled", false); -} - void ShadowRoot::AddInsertionPoint(HTMLContentElement* aInsertionPoint) { diff --git a/content/base/src/ShadowRoot.h b/content/base/src/ShadowRoot.h index bf28ed189948..fe769fde06c5 100644 --- a/content/base/src/ShadowRoot.h +++ b/content/base/src/ShadowRoot.h @@ -48,7 +48,6 @@ public: void AddToIdTable(Element* aElement, nsIAtom* aId); void RemoveFromIdTable(Element* aElement, nsIAtom* aId); - static bool PrefEnabled(); void InsertSheet(nsCSSStyleSheet* aSheet, nsIContent* aLinkingContent); void RemoveSheet(nsCSSStyleSheet* aSheet); bool ApplyAuthorStyles(); diff --git a/content/base/src/WebSocket.cpp b/content/base/src/WebSocket.cpp index e0c262394096..6f076dd3fb68 100644 --- a/content/base/src/WebSocket.cpp +++ b/content/base/src/WebSocket.cpp @@ -954,7 +954,7 @@ WebSocket::CreateAndDispatchCloseEvent(bool aWasClean, } bool -WebSocket::PrefEnabled() +WebSocket::PrefEnabled(JSContext* aCx, JSObject* aGlobal) { return Preferences::GetBool("network.websocket.enabled", true); } diff --git a/content/base/src/WebSocket.h b/content/base/src/WebSocket.h index f1029bf05490..41db9a36aa66 100644 --- a/content/base/src/WebSocket.h +++ b/content/base/src/WebSocket.h @@ -74,7 +74,7 @@ public: public: // static helpers: // Determine if preferences allow WebSocket - static bool PrefEnabled(); + static bool PrefEnabled(JSContext* aCx = nullptr, JSObject* aGlobal = nullptr); public: // WebIDL interface: diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index 0177efb85f17..39b925bca048 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -526,6 +526,8 @@ nsFrameLoader::ReallyStartLoadingInternal() rv = NS_NewURI(getter_AddRefs(referrer), referrerStr); loadInfo->SetSrcdocData(srcdoc); + nsCOMPtr baseURI = mOwnerContent->GetBaseURI(); + loadInfo->SetBaseURI(baseURI); } else { rv = mOwnerContent->NodePrincipal()->GetURI(getter_AddRefs(referrer)); diff --git a/content/base/test/test_bug320799.html b/content/base/test/test_bug320799.html index 96185baf3e7d..c160283aba38 100644 --- a/content/base/test/test_bug320799.html +++ b/content/base/test/test_bug320799.html @@ -11,7 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=320799 Mozilla Bug 320799

- +