diff --git a/browser/base/content/pageinfo/pageInfo.xul b/browser/base/content/pageinfo/pageInfo.xul index d56490aae2c..a7b396ca08a 100644 --- a/browser/base/content/pageinfo/pageInfo.xul +++ b/browser/base/content/pageinfo/pageInfo.xul @@ -90,10 +90,12 @@ + + @@ -360,6 +362,18 @@ + + + diff --git a/browser/base/content/pageinfo/permissions.js b/browser/base/content/pageinfo/permissions.js index bf730df9a63..f04c47a7d33 100644 --- a/browser/base/content/pageinfo/permissions.js +++ b/browser/base/content/pageinfo/permissions.js @@ -66,6 +66,10 @@ var gPermObj = { if (gPrefs.getBoolPref("xpinstall.whitelist.required")) return BLOCK; return ALLOW; + }, + geo: function getGeoDefaultPermissions() + { + return BLOCK; } }; diff --git a/browser/base/content/test/test_bug395533.html b/browser/base/content/test/test_bug395533.html index 301e82f6170..556e63acee8 100644 --- a/browser/base/content/test/test_bug395533.html +++ b/browser/base/content/test/test_bug395533.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=395533 --> Test for Bug 395533 - + diff --git a/browser/base/content/test/test_contextmenu.html b/browser/base/content/test/test_contextmenu.html index 7aeed479130..976c6472f56 100644 --- a/browser/base/content/test/test_contextmenu.html +++ b/browser/base/content/test/test_contextmenu.html @@ -2,7 +2,7 @@ Tests for browser context menu - + diff --git a/browser/base/content/test/test_feed_discovery.html b/browser/base/content/test/test_feed_discovery.html index 35149b155cb..4cc1cd02cb9 100644 --- a/browser/base/content/test/test_feed_discovery.html +++ b/browser/base/content/test/test_feed_discovery.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=377611 --> Test for feed discovery - + diff --git a/browser/base/content/test/test_offlineNotification.html b/browser/base/content/test/test_offlineNotification.html index 766ab0b88ec..3f87e5d194a 100644 --- a/browser/base/content/test/test_offlineNotification.html +++ b/browser/base/content/test/test_offlineNotification.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=462856 --> Test offline app notification - + diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index a9cb5a7bca9..1f3f7aade6b 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -65,11 +65,7 @@ ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT))) SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) endif -EXTRA_DSO_LDOPTS += \ - $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ - $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) +EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) # migration requires mozreg, which doesn't build on WINCE; only include # it on non-CE @@ -80,6 +76,13 @@ SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) endif +# This has to come after the above chunk, because mozreg_s has dependencies on +# stuff in MOZ_COMPONENT_LIBS. +EXTRA_DSO_LDOPTS += \ + $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ + $(MOZ_COMPONENT_LIBS) \ + $(NULL) + # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) # GTK2: Need to link with glib for GNOME shell service ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT))) diff --git a/browser/components/feeds/test/test_bug368464.html b/browser/components/feeds/test/test_bug368464.html index 7df674136a7..c3815a55fa4 100644 --- a/browser/components/feeds/test/test_bug368464.html +++ b/browser/components/feeds/test/test_bug368464.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=368464 --> Test that RSS 0.90 isn't sniffed - + diff --git a/browser/components/feeds/test/test_bug408328.html b/browser/components/feeds/test/test_bug408328.html index 9636176e2ad..0f3a0fc97ba 100644 --- a/browser/components/feeds/test/test_bug408328.html +++ b/browser/components/feeds/test/test_bug408328.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=408328 --> Test feed preview safe-linkification - + diff --git a/browser/components/feeds/test/test_registerHandler.html b/browser/components/feeds/test/test_registerHandler.html index 6b3438ff143..fc1b68aa950 100644 --- a/browser/components/feeds/test/test_registerHandler.html +++ b/browser/components/feeds/test/test_registerHandler.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=402788 --> Test for Bug 402788 - + diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 7bbf8d8ee25..fa529936194 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1038,23 +1038,27 @@ GeolocationPrompt.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsIGeolocationPrompt]), prompt: function(request) { + var pm = Cc["@mozilla.org/permissionmanager;1"].getService(Ci.nsIPermissionManager); - var prefService = Cc["@mozilla.org/content-pref/service;1"].getService(Ci.nsIContentPrefService); + var result = pm.testExactPermission(request.requestingURI, "geo"); - if (prefService.hasPref(request.requestingURI, "geo.request.remember")) { - if (prefService.getPref(request.requestingURI, "geo.request.remember")) - request.allow(); - else - request.cancel(); - return; + if (result == Ci.nsIPermissionManager.ALLOW_ACTION) { + request.allow(); + return; + } + + if (result == Ci.nsIPermissionManager.DENY_ACTION) { + request.cancel(); + return; } function setPagePermission(uri, allow) { - var prefService = Cc["@mozilla.org/content-pref/service;1"].getService(Ci.nsIContentPrefService); - prefService.setPref(uri, "geo.request.remember", allow); + if (allow == true) + pm.add(uri, "geo", Ci.nsIPermissionManager.ALLOW_ACTION); + else + pm.add(uri, "geo", Ci.nsIPermissionManager.DENY_ACTION); } - function getChromeWindow(aWindow) { var chromeWin = aWindow .QueryInterface(Ci.nsIInterfaceRequestor) @@ -1079,8 +1083,8 @@ GeolocationPrompt.prototype = { var browserBundle = bundleService.createBundle("chrome://browser/locale/browser.properties"); var buttons = [{ - label: browserBundle.GetStringFromName("geolocation.tellThem"), - accessKey: browserBundle.GetStringFromName("geolocation.tellThemKey"), + label: browserBundle.GetStringFromName("geolocation.shareLocation"), + accessKey: browserBundle.GetStringFromName("geolocation.shareLocation.accesskey"), callback: function(notification) { if (notification.getElementsByClassName("rememberChoice")[0].checked) setPagePermission(request.requestingURI, true); @@ -1088,8 +1092,8 @@ GeolocationPrompt.prototype = { }, }, { - label: browserBundle.GetStringFromName("geolocation.dontTellThem"), - accessKey: browserBundle.GetStringFromName("geolocation.dontTellThemKey"), + label: browserBundle.GetStringFromName("geolocation.dontShareLocation"), + accessKey: browserBundle.GetStringFromName("geolocation.dontShareLocation.accesskey"), callback: function(notification) { if (notification.getElementsByClassName("rememberChoice")[0].checked) setPagePermission(request.requestingURI, false); @@ -1115,6 +1119,7 @@ GeolocationPrompt.prototype = { var checkbox = newBar.ownerDocument.createElementNS(XULNS, "checkbox"); checkbox.className = "rememberChoice"; checkbox.setAttribute("label", browserBundle.GetStringFromName("geolocation.remember")); + checkbox.setAttribute("accesskey", browserBundle.GetStringFromName("geolocation.remember.accesskey")); newBar.appendChild(checkbox); var link = newBar.ownerDocument.createElementNS(XULNS, "label"); diff --git a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js index a4fcaa9f005..e8e7d915a4c 100644 --- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js +++ b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js @@ -378,6 +378,12 @@ PrivateBrowsingService.prototype = { removeDataFromDomain: function PBS_removeDataFromDomain(aDomain) { + + // clear any and all network geolocation provider sessions + try { + this._prefs.deleteBranch("geo.wifi.access_token."); + } catch (e) {} + // History let (bh = Cc["@mozilla.org/browser/global-history;2"]. getService(Ci.nsIBrowserHistory)) { diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index ce491463cd9..f5f69a9c0b1 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -170,15 +170,19 @@ editBookmarkPanel.editBookmarkTitle=Edit This Bookmark editBookmark.removeBookmarks.label=Remove Bookmark;Remove Bookmarks (#1) # Geolocation UI -geolocation.tellThem=Tell them -geolocation.tellThemKey=e -geolocation.dontTellThem=Don't tell them -geolocation.dontTellThemKey=o + +# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation): +#If you're having trouble with the word Share, please use Allow and Block in your language. +geolocation.shareLocation=Share Location +geolocation.shareLocation.accesskey=a +geolocation.dontShareLocation=Don't Share +geolocation.dontShareLocation.accesskey=o geolocation.siteWantsToKnow=%S wants to know your location. # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026, # or use "..." unless \u2026 doesn't suit traditions in your locale. geolocation.learnMore=Learn More… geolocation.remember=Remember for this site +geolocation.remember.accesskey=R # Phishing/Malware Notification Bar. # LOCALIZATION NOTE (notAForgery, notAnAttack) diff --git a/browser/locales/en-US/chrome/browser/pageInfo.dtd b/browser/locales/en-US/chrome/browser/pageInfo.dtd index 7f09ff1b1e8..6504ac37e48 100644 --- a/browser/locales/en-US/chrome/browser/pageInfo.dtd +++ b/browser/locales/en-US/chrome/browser/pageInfo.dtd @@ -88,6 +88,7 @@ + @@ -96,6 +97,7 @@ + diff --git a/caps/tests/mochitest/test_bug246699.html b/caps/tests/mochitest/test_bug246699.html index bfd3a066376..d21cc4066a2 100644 --- a/caps/tests/mochitest/test_bug246699.html +++ b/caps/tests/mochitest/test_bug246699.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=246699 --> Test for Bug 246699 - + diff --git a/caps/tests/mochitest/test_bug292789.html b/caps/tests/mochitest/test_bug292789.html index 6dadf1c2c5f..612aa00b330 100644 --- a/caps/tests/mochitest/test_bug292789.html +++ b/caps/tests/mochitest/test_bug292789.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=292789 --> Test for Bug 292789 - + diff --git a/caps/tests/mochitest/test_bug423375.html b/caps/tests/mochitest/test_bug423375.html index 11b67d3da0b..b5c9f487446 100644 --- a/caps/tests/mochitest/test_bug423375.html +++ b/caps/tests/mochitest/test_bug423375.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=423375 --> Test for Bug 423375 - + diff --git a/caps/tests/mochitest/test_bug470804.html b/caps/tests/mochitest/test_bug470804.html index 7fe0ce953c2..80fa8096a20 100644 --- a/caps/tests/mochitest/test_bug470804.html +++ b/caps/tests/mochitest/test_bug470804.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=470804 --> Test for Bug 470804 - + diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 5a5f155d0aa..064fd1b4531 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -1584,6 +1584,8 @@ nsDocument::~nsDocument() mBoxObjectTable->EnumerateRead(ClearAllBoxObjects, nsnull); delete mBoxObjectTable; } + + mPendingTitleChangeEvent.Revoke(); } NS_IMPL_CYCLE_COLLECTION_CLASS(nsDocument) @@ -4932,8 +4934,8 @@ nsDocument::NotifyPossibleTitleChange(PRBool aBoundTitleElement) if (mPendingTitleChangeEvent.IsPending()) return; - nsRefPtr > event = - new nsRunnableMethod(this, + nsRefPtr > event = + new nsNonOwningRunnableMethod(this, &nsDocument::DoNotifyPossibleTitleChange); nsresult rv = NS_DispatchToCurrentThread(event); if (NS_SUCCEEDED(rv)) { diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index c0d21c34a16..f6d3c6c5885 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -1258,7 +1258,8 @@ private: nsTArray > mFinalizableFrameLoaders; nsRefPtr > mFrameLoaderRunner; - nsRevocableEventPtr > mPendingTitleChangeEvent; + nsRevocableEventPtr > + mPendingTitleChangeEvent; nsExternalResourceMap mExternalResourceMap; diff --git a/content/base/test/test_CrossSiteXHR.html b/content/base/test/test_CrossSiteXHR.html index 6a949bfd1cf..d8ec483ef87 100644 --- a/content/base/test/test_CrossSiteXHR.html +++ b/content/base/test/test_CrossSiteXHR.html @@ -3,7 +3,7 @@ Test for Cross Site XMLHttpRequest - + diff --git a/content/base/test/test_CrossSiteXHR_cache.html b/content/base/test/test_CrossSiteXHR_cache.html index 81cfbbb5a93..d1cfabaf80f 100644 --- a/content/base/test/test_CrossSiteXHR_cache.html +++ b/content/base/test/test_CrossSiteXHR_cache.html @@ -3,7 +3,7 @@ Test for Cross Site XMLHttpRequest - + diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html index 17d3eedab10..b136ca3dacd 100644 --- a/content/base/test/test_XHR.html +++ b/content/base/test/test_XHR.html @@ -2,7 +2,7 @@ Test for XMLHttpRequest - + diff --git a/content/base/test/test_XHRDocURI.html b/content/base/test/test_XHRDocURI.html index a2528120ee3..1a582debffb 100644 --- a/content/base/test/test_XHRDocURI.html +++ b/content/base/test/test_XHRDocURI.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=459470 --> XMLHttpRequest return document URIs - + diff --git a/content/base/test/test_XHRSendData.html b/content/base/test/test_XHRSendData.html index 201dcdebbe3..8e2013742ba 100644 --- a/content/base/test/test_XHRSendData.html +++ b/content/base/test/test_XHRSendData.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=464848 --> XMLHttpRequest send data and headers - + diff --git a/content/base/test/test_bug199959.html b/content/base/test/test_bug199959.html index e532be85d4e..f6021b1ee93 100644 --- a/content/base/test/test_bug199959.html +++ b/content/base/test/test_bug199959.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=199959 --> Test for Bug 199959 - + diff --git a/content/base/test/test_bug218236.html b/content/base/test/test_bug218236.html index 0dc1cf85e66..2dc52856f43 100644 --- a/content/base/test/test_bug218236.html +++ b/content/base/test/test_bug218236.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=218236 --> Test for Bug 218236 - + diff --git a/content/base/test/test_bug218277.html b/content/base/test/test_bug218277.html index e63f0188e52..73c7445653f 100644 --- a/content/base/test/test_bug218277.html +++ b/content/base/test/test_bug218277.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=218277 --> Test for Bug 218277 - + diff --git a/content/base/test/test_bug238409.html b/content/base/test/test_bug238409.html index c9b4f25a078..1edc707761c 100644 --- a/content/base/test/test_bug238409.html +++ b/content/base/test/test_bug238409.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=238409 --> Test for Bug 238409 - + diff --git a/content/base/test/test_bug254337.html b/content/base/test/test_bug254337.html index e3a6ab6f31e..a3ebf577769 100644 --- a/content/base/test/test_bug254337.html +++ b/content/base/test/test_bug254337.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=254337 --> Test for Bug 254337 - + diff --git a/content/base/test/test_bug276037-1.html b/content/base/test/test_bug276037-1.html index 4a09df949d9..8d252adc858 100644 --- a/content/base/test/test_bug276037-1.html +++ b/content/base/test/test_bug276037-1.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=276037 --> Test for Bug 276037 - + diff --git a/content/base/test/test_bug28293.html b/content/base/test/test_bug28293.html index 953aa640866..fe19e2c8a96 100644 --- a/content/base/test/test_bug28293.html +++ b/content/base/test/test_bug28293.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=28293 --> Test for Bug 28293 - + + diff --git a/content/base/test/test_bug308484.html b/content/base/test/test_bug308484.html index 0941f594924..7ef501a8bbf 100644 --- a/content/base/test/test_bug308484.html +++ b/content/base/test/test_bug308484.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=308484 --> Test for Bug 308484 - + diff --git a/content/base/test/test_bug322317.html b/content/base/test/test_bug322317.html index 30103567c01..9b9350112fe 100644 --- a/content/base/test/test_bug322317.html +++ b/content/base/test/test_bug322317.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=322317 --> Test for Bug 322317 - + diff --git a/content/base/test/test_bug326337.html b/content/base/test/test_bug326337.html index b0c4f897d36..bd2aaaa4b20 100644 --- a/content/base/test/test_bug326337.html +++ b/content/base/test/test_bug326337.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=326337 --> Test for Bug 326337 - + diff --git a/content/base/test/test_bug333198.html b/content/base/test/test_bug333198.html index 4cd096eaaa4..90fbeeb8c3e 100644 --- a/content/base/test/test_bug333198.html +++ b/content/base/test/test_bug333198.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=333198 --> Test for Bug 333198 - + diff --git a/content/base/test/test_bug337631.html b/content/base/test/test_bug337631.html index b8e7bc41596..2f407aedd44 100644 --- a/content/base/test/test_bug337631.html +++ b/content/base/test/test_bug337631.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=337631 --> Test for Bug 337631 - + diff --git a/content/base/test/test_bug338679.html b/content/base/test/test_bug338679.html index d6e9a24220d..a5d455c27e6 100644 --- a/content/base/test/test_bug338679.html +++ b/content/base/test/test_bug338679.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338679 --> Testcase bug 338679 - + diff --git a/content/base/test/test_bug339494.html b/content/base/test/test_bug339494.html index 5a65c21fa33..97fb6b20a59 100644 --- a/content/base/test/test_bug339494.html +++ b/content/base/test/test_bug339494.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=339494 --> Test for Bug 339494 - + diff --git a/content/base/test/test_bug340571.html b/content/base/test/test_bug340571.html index 327de78aa9e..a48dbf14021 100644 --- a/content/base/test/test_bug340571.html +++ b/content/base/test/test_bug340571.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=340571 --> Test for Bug 340571 - + diff --git a/content/base/test/test_bug343596.html b/content/base/test/test_bug343596.html index 5e736b7e651..f52e2f56ddc 100644 --- a/content/base/test/test_bug343596.html +++ b/content/base/test/test_bug343596.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=343596 --> Test for Bug 343596 - + diff --git a/content/base/test/test_bug345339.html b/content/base/test/test_bug345339.html index b85ad070766..acba2edae72 100644 --- a/content/base/test/test_bug345339.html +++ b/content/base/test/test_bug345339.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=345339 --> Test for Bug 345339 - + diff --git a/content/base/test/test_bug352728.html b/content/base/test/test_bug352728.html index 06354fab4cc..4f95988afdb 100644 --- a/content/base/test/test_bug352728.html +++ b/content/base/test/test_bug352728.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=352728 --> Test for Bug 352728 - + diff --git a/content/base/test/test_bug353334.html b/content/base/test/test_bug353334.html index 42ca2e2ae2a..48ac7d3e4b3 100644 --- a/content/base/test/test_bug353334.html +++ b/content/base/test/test_bug353334.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=353334 --> Test for Bug 353334 - + diff --git a/content/base/test/test_bug355026.html b/content/base/test/test_bug355026.html index 6f872416254..f437973677b 100644 --- a/content/base/test/test_bug355026.html +++ b/content/base/test/test_bug355026.html @@ -6,7 +6,7 @@ Test from Adam Guthrie. https://bugzilla.mozilla.org/show_bug.cgi?id=355026 --> - + diff --git a/content/base/test/test_bug357450.html b/content/base/test/test_bug357450.html index d519473c685..68869ee01b3 100644 --- a/content/base/test/test_bug357450.html +++ b/content/base/test/test_bug357450.html @@ -6,7 +6,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=357450 Test for Bug 357450 - + diff --git a/content/base/test/test_bug357509.html b/content/base/test/test_bug357509.html index eb70e3c7d98..a2e92e6330f 100644 --- a/content/base/test/test_bug357509.html +++ b/content/base/test/test_bug357509.html @@ -3,7 +3,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=357509 --> - + + diff --git a/content/base/test/test_bug366946.html b/content/base/test/test_bug366946.html index 798ce5b5f3a..6b12086f118 100644 --- a/content/base/test/test_bug366946.html +++ b/content/base/test/test_bug366946.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=366946 --> Test for Bug 366946 - + diff --git a/content/base/test/test_bug367164.html b/content/base/test/test_bug367164.html index daa074dc420..eca2a2eccb4 100644 --- a/content/base/test/test_bug367164.html +++ b/content/base/test/test_bug367164.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=367164 --> Test for Bug 367164 - + diff --git a/content/base/test/test_bug368972.html b/content/base/test/test_bug368972.html index bfa1267e263..77ef60586a1 100644 --- a/content/base/test/test_bug368972.html +++ b/content/base/test/test_bug368972.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=368972 --> Test for Bug 368972 - + diff --git a/layout/style/test/test_bug160403.html b/layout/style/test/test_bug160403.html index 68cbee76e15..dd1af970547 100644 --- a/layout/style/test/test_bug160403.html +++ b/layout/style/test/test_bug160403.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=160403 --> Test for Bug 160403 - + diff --git a/layout/style/test/test_bug221428.html b/layout/style/test/test_bug221428.html index b48d276996f..1a0056cc7d8 100644 --- a/layout/style/test/test_bug221428.html +++ b/layout/style/test/test_bug221428.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=221428 --> Test for Bug 221428 - + diff --git a/layout/style/test/test_bug229915.html b/layout/style/test/test_bug229915.html index 602fe1b5027..abffe6ce63a 100644 --- a/layout/style/test/test_bug229915.html +++ b/layout/style/test/test_bug229915.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=229915 --> Test for Bug 229915 - + diff --git a/layout/style/test/test_css_eof_handling.html b/layout/style/test/test_css_eof_handling.html index c13d6f1ac8a..e34d1a60c93 100644 --- a/layout/style/test/test_css_eof_handling.html +++ b/layout/style/test/test_css_eof_handling.html @@ -2,7 +2,7 @@ Test for CSS EOF handling - + diff --git a/layout/style/test/test_descriptor_storage.html b/layout/style/test/test_descriptor_storage.html index b4c7e9255da..50982485473 100644 --- a/layout/style/test/test_descriptor_storage.html +++ b/layout/style/test/test_descriptor_storage.html @@ -4,7 +4,7 @@ --> Test for parsing, storage, and serialization of CSS @font-face descriptor values - + diff --git a/layout/style/test/test_descriptor_syntax_errors.html b/layout/style/test/test_descriptor_syntax_errors.html index 01f00e68526..eef82c539b9 100644 --- a/layout/style/test/test_descriptor_syntax_errors.html +++ b/layout/style/test/test_descriptor_syntax_errors.html @@ -4,7 +4,7 @@ --> Test that we reject syntax errors listed in descriptor_database.js - + diff --git a/layout/style/test/test_dont_use_document_colors.html b/layout/style/test/test_dont_use_document_colors.html index 02baf33f7f2..f7e89f5fe90 100644 --- a/layout/style/test/test_dont_use_document_colors.html +++ b/layout/style/test/test_dont_use_document_colors.html @@ -4,7 +4,7 @@ --> Test for preference not to use document colors - + diff --git a/layout/style/test/test_inherit_storage.html b/layout/style/test/test_inherit_storage.html index d000eb34c03..a67332403ef 100644 --- a/layout/style/test/test_inherit_storage.html +++ b/layout/style/test/test_inherit_storage.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=375363 --> Test for parsing, storage, and serialization of CSS 'inherit' - + diff --git a/layout/style/test/test_initial_computation.html b/layout/style/test/test_initial_computation.html index 30f5e69a10d..e8dad583684 100644 --- a/layout/style/test/test_initial_computation.html +++ b/layout/style/test/test_initial_computation.html @@ -4,7 +4,7 @@ --> Test for computation of CSS '-moz-initial' - + diff --git a/layout/style/test/test_initial_storage.html b/layout/style/test/test_initial_storage.html index 15060e1e31e..e6dbe8f7a33 100644 --- a/layout/style/test/test_initial_storage.html +++ b/layout/style/test/test_initial_storage.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=375363 --> Test for parsing, storage, and serialization of CSS '-moz-initial' - + diff --git a/layout/style/test/test_media_queries.html b/layout/style/test/test_media_queries.html index 7e9b1a294c3..ecc1eb0cfa5 100644 --- a/layout/style/test/test_media_queries.html +++ b/layout/style/test/test_media_queries.html @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=156716 --> Test for Bug 156716 - + @@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=156716 
-
+  
   
   
 
diff --git a/layout/style/test/test_media_queries_dynamic_xbl.html b/layout/style/test/test_media_queries_dynamic_xbl.html
index 7ab8a6d6670..074614d4590 100644
--- a/layout/style/test/test_media_queries_dynamic_xbl.html
+++ b/layout/style/test/test_media_queries_dynamic_xbl.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=156716
 -->
 
   Test for Bug 156716
-  
+  
   
   
 
diff --git a/layout/style/test/test_namespace_rule.html b/layout/style/test/test_namespace_rule.html
index 58cc349889f..a9a8bacc6ba 100644
--- a/layout/style/test/test_namespace_rule.html
+++ b/layout/style/test/test_namespace_rule.html
@@ -2,7 +2,7 @@
 
 
   Test for CSS Namespace rules
-  
+  
   
   
 
diff --git a/layout/style/test/test_parse_rule.html b/layout/style/test/test_parse_rule.html
index 43f3946b795..d53eed2ee8d 100644
--- a/layout/style/test/test_parse_rule.html
+++ b/layout/style/test/test_parse_rule.html
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
diff --git a/layout/style/test/test_parse_url.html b/layout/style/test/test_parse_url.html
index f2b8d4fb62d..930e99f3d8e 100644
--- a/layout/style/test/test_parse_url.html
+++ b/layout/style/test/test_parse_url.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=473914
 -->
 
   Test for Bug 473914
-  
+  
   
   
 
diff --git a/layout/style/test/test_priority_preservation.html b/layout/style/test/test_priority_preservation.html
index d0fad231aac..406519ae0ce 100644
--- a/layout/style/test/test_priority_preservation.html
+++ b/layout/style/test/test_priority_preservation.html
@@ -2,7 +2,7 @@
 
 
   Test for property priority preservation
-  
+  
   
   
 
diff --git a/layout/style/test/test_property_database.html b/layout/style/test/test_property_database.html
index 2ac585abbcc..0180ac92196 100644
--- a/layout/style/test/test_property_database.html
+++ b/layout/style/test/test_property_database.html
@@ -4,7 +4,7 @@
 -->
 
   Test that property_database.js contains all supported CSS properties
-  
+  
   
   
   
diff --git a/layout/style/test/test_property_syntax_errors.html b/layout/style/test/test_property_syntax_errors.html
index f54db56be66..4f1e357fb7e 100644
--- a/layout/style/test/test_property_syntax_errors.html
+++ b/layout/style/test/test_property_syntax_errors.html
@@ -4,7 +4,7 @@
 -->
 
   Test that we reject syntax errors listed in property_database.js
-  
+  
   
   
   
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index 10bd341977a..6f0123264f7 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -2,7 +2,7 @@
 
 
   Test for CSS Selectors
-  
+  
   
   
 
diff --git a/layout/style/test/test_selectors_on_anonymous_content.html b/layout/style/test/test_selectors_on_anonymous_content.html
index ac323b78529..efeb1676c71 100644
--- a/layout/style/test/test_selectors_on_anonymous_content.html
+++ b/layout/style/test/test_selectors_on_anonymous_content.html
@@ -6,7 +6,7 @@
       Separate from test_selectors.html so we don't need to deal with
       waiting for the binding document to load.
     -->
-  
+  
   
   
   
diff --git a/layout/style/test/test_system_font_serialization.html b/layout/style/test/test_system_font_serialization.html
index 4e3f888d495..a17359b0c93 100644
--- a/layout/style/test/test_system_font_serialization.html
+++ b/layout/style/test/test_system_font_serialization.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=475214
 -->
 
   Test for Bug 475214
-  
+  
   
   
 
diff --git a/layout/style/test/test_units_angle.html b/layout/style/test/test_units_angle.html
index 8467fbcb297..574b42de7b3 100644
--- a/layout/style/test/test_units_angle.html
+++ b/layout/style/test/test_units_angle.html
@@ -2,7 +2,7 @@
 
 
   Test for serialization and equivalence of angle units
-  
+  
   
   
 
diff --git a/layout/style/test/test_units_frequency.html b/layout/style/test/test_units_frequency.html
index f9ab368f762..7ea904e347a 100644
--- a/layout/style/test/test_units_frequency.html
+++ b/layout/style/test/test_units_frequency.html
@@ -2,7 +2,7 @@
 
 
   Test for serialization and equivalence of frequency units
-  
+  
   
   
 
diff --git a/layout/style/test/test_units_length.html b/layout/style/test/test_units_length.html
index 99c6152afd9..933fb79c32f 100644
--- a/layout/style/test/test_units_length.html
+++ b/layout/style/test/test_units_length.html
@@ -2,7 +2,7 @@
 
 
   Test for serialization and equivalence of length units
-  
+  
   
   
 
diff --git a/layout/style/test/test_units_time.html b/layout/style/test/test_units_time.html
index b59e84a60cb..ee16f19f999 100644
--- a/layout/style/test/test_units_time.html
+++ b/layout/style/test/test_units_time.html
@@ -2,7 +2,7 @@
 
 
   Test for serialization and equivalence of time units
-  
+  
   
   
 
diff --git a/layout/style/test/test_value_computation.html b/layout/style/test/test_value_computation.html
index fb0423d4734..4b7a1103a3c 100644
--- a/layout/style/test/test_value_computation.html
+++ b/layout/style/test/test_value_computation.html
@@ -4,7 +4,7 @@
 -->
 
   Test for computation of values in property database
-  
+  
   
   
   
diff --git a/layout/style/test/test_value_storage.html b/layout/style/test/test_value_storage.html
index 7c2e95ec3f3..933880e2f43 100644
--- a/layout/style/test/test_value_storage.html
+++ b/layout/style/test/test_value_storage.html
@@ -4,7 +4,7 @@
 -->
 
   Test for parsing, storage, and serialization of CSS values
-  
+  
   
   
   
diff --git a/layout/style/test/test_visited_pref.html b/layout/style/test/test_visited_pref.html
index b8162e7d8be..0ad9f41a9d4 100644
--- a/layout/style/test/test_visited_pref.html
+++ b/layout/style/test/test_visited_pref.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=147777
 -->
 
   Test for visited link coloring pref Bug 147777
-  
+