fix(devops): use full SHAs in diffs

Different GIT setups export different length of shortsha.
With this, always export full SHA.
This commit is contained in:
Andrey Lushnikov 2019-12-16 16:17:56 -08:00
parent 4b7a017456
commit 39357c3f6c
3 changed files with 178 additions and 178 deletions

View File

@ -109,7 +109,7 @@ fi
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
NEW_BASE_REVISION=$(git merge-base $REMOTE_BROWSER_UPSTREAM/$BASE_BRANCH $CURRENT_BRANCH)
NEW_DIFF=$(git diff $NEW_BASE_REVISION $CURRENT_BRANCH)
NEW_DIFF=$(git diff --full-index $NEW_BASE_REVISION $CURRENT_BRANCH)
# Increment BUILD_NUMBER
BUILD_NUMBER=$(cat $EXPORT_PATH/BUILD_NUMBER)
BUILD_NUMBER=$((BUILD_NUMBER+1))

View File

@ -1,5 +1,5 @@
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index 711ce5c668c0..7b65d87e3af8 100644
index 711ce5c668c08ecf324027c5392c6f1ebab8a5ec..7b65d87e3af89d884655a59b585002e48e0a275c 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -139,6 +139,11 @@ browser/chrome/browser/res/payments/formautofill/autofillEditForms.js
@ -15,7 +15,7 @@ index 711ce5c668c0..7b65d87e3af8 100644
gmp-clearkey/0.1/manifest.json
i686/gmp-clearkey/0.1/manifest.json
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 92ae9f605273..a0ae741c78ae 100644
index 92ae9f6052731a1b96b3b6f11f309267fc886283..a0ae741c78ae514f4721c619ea74ff2c6db447d6 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -208,6 +208,11 @@
@ -31,7 +31,7 @@ index 92ae9f605273..a0ae741c78ae 100644
@RESPATH@/components/TestInterfaceJS.js
@RESPATH@/components/TestInterfaceJS.manifest
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index cb9022a5f143..440211615485 100644
index cb9022a5f143405722f3bd51423625ec32aba04c..4402116154858278e20fd0a04f73e19354c34f99 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -97,6 +97,7 @@
@ -115,7 +115,7 @@ index cb9022a5f143..440211615485 100644
nsDocShell::GetIsNavigating(bool* aOut) {
*aOut = mIsNavigating;
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index e69bc03ddaf2..e154ecf5f5e4 100644
index e69bc03ddaf2081df1bc84eb21bb2f0244d18bed..e154ecf5f5e4ecf5fd07cfab8812cb21c3af14d6 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -18,6 +18,7 @@
@ -157,7 +157,7 @@ index e69bc03ddaf2..e154ecf5f5e4 100644
bool mAllowKeywordFixup : 1;
bool mIsOffScreenBrowser : 1;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index 40ca833abc52..bfe4c9ae54e2 100644
index 40ca833abc529595f1b90121a1d153c94746b578..bfe4c9ae54e2399a81a632ab16f3ce7e40e9deb8 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -1153,4 +1153,9 @@ interface nsIDocShell : nsIDocShellTreeItem
@ -171,7 +171,7 @@ index 40ca833abc52..bfe4c9ae54e2 100644
+
};
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
index 290fa4baac5b..72c18a8b4f43 100644
index 290fa4baac5b7e3dbfe0415d6755d838f1282afa..72c18a8b4f43a0300742cff0047ebbc17e6168e1 100644
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -3078,6 +3078,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
@ -197,7 +197,7 @@ index 290fa4baac5b..72c18a8b4f43 100644
if (mLoadedAsData) {
return NS_OK;
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
index c0483590b22a..a4d31b2b18e4 100644
index c0483590b22a7ad763f008f4a4dccc86a9572c5d..a4d31b2b18e474d84239985988d68ec195852d44 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -45,6 +45,7 @@
@ -222,7 +222,7 @@ index c0483590b22a..a4d31b2b18e4 100644
return NS_OK;
}
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
index 2b2362181264..a5dca3071fdb 100644
index 2b236218126427a454b85bfbaabc3f0759e92130..a5dca3071fdbe677fcb7d3c540f3ebe90c4a1f9d 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@@ -3650,6 +3650,13 @@ NS_IMETHODIMP BrowserChild::OnStateChange(nsIWebProgress* aWebProgress,
@ -240,7 +240,7 @@ index 2b2362181264..a5dca3071fdb 100644
nsIRequest* aRequest,
int32_t aCurSelfProgress,
diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
index fb7692aa0337..66805103f6ff 100644
index fb7692aa03375598e917cf81fd6faa6934f7bf84..66805103f6ff6c089e8f674cde534ea8dece62df 100644
--- a/dom/security/nsCSPUtils.cpp
+++ b/dom/security/nsCSPUtils.cpp
@@ -122,6 +122,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
@ -256,7 +256,7 @@ index fb7692aa0337..66805103f6ff 100644
nsContentUtils::TrimWhitespace<nsContentUtils::IsHTMLWhitespace>(
aPolicyStr));
diff --git a/extensions/permissions/nsPermissionManager.cpp b/extensions/permissions/nsPermissionManager.cpp
index 9f40b6123b2d..45ea8152d545 100644
index 9f40b6123b2d3dcf2f57a34654baedb3b07b918b..45ea8152d5453c74dd60d4a8d5ad60c6b9c6c3d4 100644
--- a/extensions/permissions/nsPermissionManager.cpp
+++ b/extensions/permissions/nsPermissionManager.cpp
@@ -167,7 +167,7 @@ void MaybeStripOAs(OriginAttributes& aOriginAttributes) {
@ -287,7 +287,7 @@ index 9f40b6123b2d..45ea8152d545 100644
nsCOMPtr<nsIPrincipal> principal =
diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp
index 0d62c2cd2b67..9a5d68c9daa8 100644
index 0d62c2cd2b672bf6c155a66aca8879db0dbb5f11..9a5d68c9daa85bd665a6c566fc3783300c60f447 100644
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
@@ -1066,9 +1066,12 @@ void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) {
@ -305,7 +305,7 @@ index 0d62c2cd2b67..9a5d68c9daa8 100644
nsCOMPtr<nsIContentSecurityPolicy> preloadCsp = mDocument->GetPreloadCsp();
if (!preloadCsp) {
diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp
index 31737688948a..255e5ae967b4 100644
index 31737688948a1c70fc16c806b70b052a666fc0a6..255e5ae967b43668fedf3fdedde39e21f249c11c 100644
--- a/security/manager/ssl/nsCertOverrideService.cpp
+++ b/security/manager/ssl/nsCertOverrideService.cpp
@@ -611,7 +611,7 @@ nsCertOverrideService::IsCertUsedForOverrides(nsIX509Cert* aCert,
@ -319,7 +319,7 @@ index 31737688948a..255e5ae967b4 100644
}
diff --git a/testing/juggler/BrowserContextManager.js b/testing/juggler/BrowserContextManager.js
new file mode 100644
index 000000000000..febd84e31552
index 0000000000000000000000000000000000000000..febd84e315529a60db5967a1f4efed553a46851d
--- /dev/null
+++ b/testing/juggler/BrowserContextManager.js
@@ -0,0 +1,173 @@
@ -498,7 +498,7 @@ index 000000000000..febd84e31552
+
diff --git a/testing/juggler/Helper.js b/testing/juggler/Helper.js
new file mode 100644
index 000000000000..673e93b0278a
index 0000000000000000000000000000000000000000..673e93b0278a3502d94006696cea7e6e8e820deb
--- /dev/null
+++ b/testing/juggler/Helper.js
@@ -0,0 +1,101 @@
@ -605,7 +605,7 @@ index 000000000000..673e93b0278a
+
diff --git a/testing/juggler/NetworkObserver.js b/testing/juggler/NetworkObserver.js
new file mode 100644
index 000000000000..2afbc74a4170
index 0000000000000000000000000000000000000000..2afbc74a4170233e76dadd7e7b294ca30a73e723
--- /dev/null
+++ b/testing/juggler/NetworkObserver.js
@@ -0,0 +1,450 @@
@ -1061,7 +1061,7 @@ index 000000000000..2afbc74a4170
+this.NetworkObserver = NetworkObserver;
diff --git a/testing/juggler/TargetRegistry.js b/testing/juggler/TargetRegistry.js
new file mode 100644
index 000000000000..da5e4ee371d0
index 0000000000000000000000000000000000000000..da5e4ee371d03bd0c6524cef694b12b735f57350
--- /dev/null
+++ b/testing/juggler/TargetRegistry.js
@@ -0,0 +1,187 @@
@ -1254,7 +1254,7 @@ index 000000000000..da5e4ee371d0
+this.TargetRegistry = TargetRegistry;
diff --git a/testing/juggler/components/juggler.js b/testing/juggler/components/juggler.js
new file mode 100644
index 000000000000..9654aeeb257d
index 0000000000000000000000000000000000000000..9654aeeb257d2741e728c45c1a81d9c3d2c654af
--- /dev/null
+++ b/testing/juggler/components/juggler.js
@@ -0,0 +1,112 @@
@ -1372,7 +1372,7 @@ index 000000000000..9654aeeb257d
+}
diff --git a/testing/juggler/components/juggler.manifest b/testing/juggler/components/juggler.manifest
new file mode 100644
index 000000000000..50f893020756
index 0000000000000000000000000000000000000000..50f8930207563e0d6b8a7878fc602dbca54d77fc
--- /dev/null
+++ b/testing/juggler/components/juggler.manifest
@@ -0,0 +1,3 @@
@ -1381,7 +1381,7 @@ index 000000000000..50f893020756
+category command-line-handler m-juggler @mozilla.org/remote/juggler;1
diff --git a/testing/juggler/components/moz.build b/testing/juggler/components/moz.build
new file mode 100644
index 000000000000..268fbc361d80
index 0000000000000000000000000000000000000000..268fbc361d8053182bb6c27f626e853dd7aeb254
--- /dev/null
+++ b/testing/juggler/components/moz.build
@@ -0,0 +1,9 @@
@ -1396,7 +1396,7 @@ index 000000000000..268fbc361d80
+
diff --git a/testing/juggler/content/ContentSession.js b/testing/juggler/content/ContentSession.js
new file mode 100644
index 000000000000..f68780d529e7
index 0000000000000000000000000000000000000000..f68780d529e753e7456c3182b051ad790dcd0e16
--- /dev/null
+++ b/testing/juggler/content/ContentSession.js
@@ -0,0 +1,63 @@
@ -1465,7 +1465,7 @@ index 000000000000..f68780d529e7
+
diff --git a/testing/juggler/content/FrameTree.js b/testing/juggler/content/FrameTree.js
new file mode 100644
index 000000000000..640782151e30
index 0000000000000000000000000000000000000000..640782151e30b2a34b3c0c57e88a4053b5382a88
--- /dev/null
+++ b/testing/juggler/content/FrameTree.js
@@ -0,0 +1,240 @@
@ -1711,7 +1711,7 @@ index 000000000000..640782151e30
+
diff --git a/testing/juggler/content/NetworkMonitor.js b/testing/juggler/content/NetworkMonitor.js
new file mode 100644
index 000000000000..2508cce41565
index 0000000000000000000000000000000000000000..2508cce41565023b7fee9c7b85afe8ecebd26e7d
--- /dev/null
+++ b/testing/juggler/content/NetworkMonitor.js
@@ -0,0 +1,62 @@
@ -1779,7 +1779,7 @@ index 000000000000..2508cce41565
+
diff --git a/testing/juggler/content/PageAgent.js b/testing/juggler/content/PageAgent.js
new file mode 100644
index 000000000000..266fad046ba2
index 0000000000000000000000000000000000000000..266fad046ba2fcc950b250fed49be61d10ee6776
--- /dev/null
+++ b/testing/juggler/content/PageAgent.js
@@ -0,0 +1,661 @@
@ -2446,7 +2446,7 @@ index 000000000000..266fad046ba2
+
diff --git a/testing/juggler/content/RuntimeAgent.js b/testing/juggler/content/RuntimeAgent.js
new file mode 100644
index 000000000000..a8f017a07133
index 0000000000000000000000000000000000000000..a8f017a071334c73aa96160c96018e6f5ac65d1f
--- /dev/null
+++ b/testing/juggler/content/RuntimeAgent.js
@@ -0,0 +1,468 @@
@ -2920,7 +2920,7 @@ index 000000000000..a8f017a07133
+this.RuntimeAgent = RuntimeAgent;
diff --git a/testing/juggler/content/ScrollbarManager.js b/testing/juggler/content/ScrollbarManager.js
new file mode 100644
index 000000000000..caee4df323d0
index 0000000000000000000000000000000000000000..caee4df323d0a526ed7e38947c41c6430983568d
--- /dev/null
+++ b/testing/juggler/content/ScrollbarManager.js
@@ -0,0 +1,85 @@
@ -3011,7 +3011,7 @@ index 000000000000..caee4df323d0
+
diff --git a/testing/juggler/content/floating-scrollbars.css b/testing/juggler/content/floating-scrollbars.css
new file mode 100644
index 000000000000..7709bdd34c65
index 0000000000000000000000000000000000000000..7709bdd34c65062fc63684ef17fc792d3991d965
--- /dev/null
+++ b/testing/juggler/content/floating-scrollbars.css
@@ -0,0 +1,47 @@
@ -3064,7 +3064,7 @@ index 000000000000..7709bdd34c65
+}
diff --git a/testing/juggler/content/hidden-scrollbars.css b/testing/juggler/content/hidden-scrollbars.css
new file mode 100644
index 000000000000..3a386425d379
index 0000000000000000000000000000000000000000..3a386425d3796d0a6786dea193b3402dfd2ac4f6
--- /dev/null
+++ b/testing/juggler/content/hidden-scrollbars.css
@@ -0,0 +1,13 @@
@ -3083,7 +3083,7 @@ index 000000000000..3a386425d379
+
diff --git a/testing/juggler/content/main.js b/testing/juggler/content/main.js
new file mode 100644
index 000000000000..8585092e04e7
index 0000000000000000000000000000000000000000..8585092e04e7e763a0c115c28363e505e8eb91bd
--- /dev/null
+++ b/testing/juggler/content/main.js
@@ -0,0 +1,39 @@
@ -3128,7 +3128,7 @@ index 000000000000..8585092e04e7
+
diff --git a/testing/juggler/jar.mn b/testing/juggler/jar.mn
new file mode 100644
index 000000000000..27f5a15fd7f1
index 0000000000000000000000000000000000000000..27f5a15fd7f14385bb1f080d5965d90e60423d1a
--- /dev/null
+++ b/testing/juggler/jar.mn
@@ -0,0 +1,29 @@
@ -3163,7 +3163,7 @@ index 000000000000..27f5a15fd7f1
+
diff --git a/testing/juggler/moz.build b/testing/juggler/moz.build
new file mode 100644
index 000000000000..1a0a3130bf95
index 0000000000000000000000000000000000000000..1a0a3130bf9509829744fadc692a79754fddd351
--- /dev/null
+++ b/testing/juggler/moz.build
@@ -0,0 +1,15 @@
@ -3184,7 +3184,7 @@ index 000000000000..1a0a3130bf95
+
diff --git a/testing/juggler/protocol/AccessibilityHandler.js b/testing/juggler/protocol/AccessibilityHandler.js
new file mode 100644
index 000000000000..fc8a7397e50a
index 0000000000000000000000000000000000000000..fc8a7397e50a3316760bd0b4fee74ef7fb97e1c5
--- /dev/null
+++ b/testing/juggler/protocol/AccessibilityHandler.js
@@ -0,0 +1,15 @@
@ -3205,7 +3205,7 @@ index 000000000000..fc8a7397e50a
+this.AccessibilityHandler = AccessibilityHandler;
diff --git a/testing/juggler/protocol/BrowserHandler.js b/testing/juggler/protocol/BrowserHandler.js
new file mode 100644
index 000000000000..708059a95b3a
index 0000000000000000000000000000000000000000..708059a95b3a01f3d9c7b7ef4714ee6f8ab26b94
--- /dev/null
+++ b/testing/juggler/protocol/BrowserHandler.js
@@ -0,0 +1,66 @@
@ -3277,7 +3277,7 @@ index 000000000000..708059a95b3a
+this.BrowserHandler = BrowserHandler;
diff --git a/testing/juggler/protocol/Dispatcher.js b/testing/juggler/protocol/Dispatcher.js
new file mode 100644
index 000000000000..7b3a6fa4fe7a
index 0000000000000000000000000000000000000000..7b3a6fa4fe7a2b50a78ed446fbf5537504994798
--- /dev/null
+++ b/testing/juggler/protocol/Dispatcher.js
@@ -0,0 +1,255 @@
@ -3538,7 +3538,7 @@ index 000000000000..7b3a6fa4fe7a
+
diff --git a/testing/juggler/protocol/NetworkHandler.js b/testing/juggler/protocol/NetworkHandler.js
new file mode 100644
index 000000000000..f5e7e919594b
index 0000000000000000000000000000000000000000..f5e7e919594b3778fd3046bf69d34878cccefa64
--- /dev/null
+++ b/testing/juggler/protocol/NetworkHandler.js
@@ -0,0 +1,154 @@
@ -3698,7 +3698,7 @@ index 000000000000..f5e7e919594b
+this.NetworkHandler = NetworkHandler;
diff --git a/testing/juggler/protocol/PageHandler.js b/testing/juggler/protocol/PageHandler.js
new file mode 100644
index 000000000000..13e659902758
index 0000000000000000000000000000000000000000..13e659902758eeb3482d33a7084d8dfd0d330f1e
--- /dev/null
+++ b/testing/juggler/protocol/PageHandler.js
@@ -0,0 +1,281 @@
@ -3985,7 +3985,7 @@ index 000000000000..13e659902758
+this.PageHandler = PageHandler;
diff --git a/testing/juggler/protocol/PrimitiveTypes.js b/testing/juggler/protocol/PrimitiveTypes.js
new file mode 100644
index 000000000000..78b6601b91d0
index 0000000000000000000000000000000000000000..78b6601b91d0b7fcda61114e6846aa07f95a06fa
--- /dev/null
+++ b/testing/juggler/protocol/PrimitiveTypes.js
@@ -0,0 +1,143 @@
@ -4134,7 +4134,7 @@ index 000000000000..78b6601b91d0
+this.EXPORTED_SYMBOLS = ['t', 'checkScheme'];
diff --git a/testing/juggler/protocol/Protocol.js b/testing/juggler/protocol/Protocol.js
new file mode 100644
index 000000000000..700571aeed45
index 0000000000000000000000000000000000000000..700571aeed4509ad5429adb35d9fd4c2d7cd8113
--- /dev/null
+++ b/testing/juggler/protocol/Protocol.js
@@ -0,0 +1,668 @@
@ -4808,7 +4808,7 @@ index 000000000000..700571aeed45
+this.EXPORTED_SYMBOLS = ['protocol', 'checkScheme'];
diff --git a/testing/juggler/protocol/RuntimeHandler.js b/testing/juggler/protocol/RuntimeHandler.js
new file mode 100644
index 000000000000..0026e8ff58ef
index 0000000000000000000000000000000000000000..0026e8ff58ef6268f4c63783d0ff68ff355b1e72
--- /dev/null
+++ b/testing/juggler/protocol/RuntimeHandler.js
@@ -0,0 +1,41 @@
@ -4855,7 +4855,7 @@ index 000000000000..0026e8ff58ef
+this.RuntimeHandler = RuntimeHandler;
diff --git a/testing/juggler/protocol/TargetHandler.js b/testing/juggler/protocol/TargetHandler.js
new file mode 100644
index 000000000000..4ea36eeba758
index 0000000000000000000000000000000000000000..4ea36eeba75864ddb09d4a9c0814f18ccfdd7bde
--- /dev/null
+++ b/testing/juggler/protocol/TargetHandler.js
@@ -0,0 +1,75 @@
@ -4935,7 +4935,7 @@ index 000000000000..4ea36eeba758
+var EXPORTED_SYMBOLS = ['TargetHandler'];
+this.TargetHandler = TargetHandler;
diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
index 9aea55ddf773..188a0f28b8e1 100644
index 9aea55ddf7739d4ec129f9c48ebcc0736a7b7365..188a0f28b8e12a61e1fe89ba86350a844b809625 100644
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
+++ b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp
@@ -179,8 +179,16 @@ nsBrowserStatusFilter::OnStateChange(nsIWebProgress* aWebProgress,
@ -4958,7 +4958,7 @@ index 9aea55ddf773..188a0f28b8e1 100644
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index bec85cc1eb73..f0691908886e 100644
index bec85cc1eb7317221e20afa7ca0643b7bfba6b1a..f0691908886e549cc583714cb53383b027d25044 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -169,6 +169,7 @@ if CONFIG['ENABLE_MARIONETTE']:
@ -4970,7 +4970,7 @@ index bec85cc1eb73..f0691908886e 100644
]
diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
index 92cb5f3cf6da..bfcb01b08156 100644
index 92cb5f3cf6dad25b375f942428f5403a06842d7c..bfcb01b081566cb9aa8ecd80a1f67497778d2519 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -763,6 +763,13 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout) {
@ -5013,7 +5013,7 @@ index 92cb5f3cf6da..bfcb01b08156 100644
nsIRequest* aRequest, nsresult aStatus,
const char16_t* aMessage) {
diff --git a/uriloader/base/nsDocLoader.h b/uriloader/base/nsDocLoader.h
index 14d9d1052ef2..c9b2f0676e30 100644
index 14d9d1052ef2a44ba2066572de306034d9f3a8c6..c9b2f0676e3010967b784eccb6f29ec6f50d926a 100644
--- a/uriloader/base/nsDocLoader.h
+++ b/uriloader/base/nsDocLoader.h
@@ -212,6 +212,11 @@ class nsDocLoader : public nsIDocumentLoader,
@ -5029,7 +5029,7 @@ index 14d9d1052ef2..c9b2f0676e30 100644
int32_t aDelay, bool aSameURI);
diff --git a/uriloader/base/nsIWebProgress.idl b/uriloader/base/nsIWebProgress.idl
index b0cde5026dc7..09ebb0ef6799 100644
index b0cde5026dc7c414e8f20300ac2b7d735dbd846e..09ebb0ef6799cf6a74fe529d4d000c6bed2c9497 100644
--- a/uriloader/base/nsIWebProgress.idl
+++ b/uriloader/base/nsIWebProgress.idl
@@ -87,6 +87,10 @@ interface nsIWebProgress : nsISupports
@ -5058,7 +5058,7 @@ index b0cde5026dc7..09ebb0ef6799 100644
/**
* Registers a listener to receive web progress events.
diff --git a/uriloader/base/nsIWebProgressListener2.idl b/uriloader/base/nsIWebProgressListener2.idl
index 87701f8d2cfe..ae1aa85c019c 100644
index 87701f8d2cfee8bd84acd28c62b3be4989c9474c..ae1aa85c019cb21d4f7e79c35e8afe72709468a1 100644
--- a/uriloader/base/nsIWebProgressListener2.idl
+++ b/uriloader/base/nsIWebProgressListener2.idl
@@ -66,4 +66,27 @@ interface nsIWebProgressListener2 : nsIWebProgressListener {

File diff suppressed because it is too large Load Diff