Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 45faa95

Browse files
indygregindygreg
committed
Merge mozilla-central into build-system
Only conflict was configure.in amd was due to context, not changed lines themselves.
2 parents bbaccdd + 0f670c7 commit 45faa95

151 files changed

Lines changed: 2145 additions & 996 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎browser/base/content/test/test_bug787619.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<script class="testbody" type="application/javascript;version=1.7">
1919
SimpleTest.waitForExplicitFinish();
2020

21-
const Ci = Components.interfaces;
21+
const Ci = SpecialPowers.Ci;
2222
let wrapperClickCount = 0;
2323

2424
function test1() {

‎browser/branding/aurora/Makefile.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,11 @@ BRANDING_DEST := $(DIST)/branding
6464
BRANDING_TARGET := export
6565
INSTALL_TARGETS += BRANDING
6666

67+
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
68+
VISUALMANIFEST := VisualElementsManifest.xml
69+
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
70+
VISUALMANIFEST_PATH := $(DIST)/bin
71+
PP_TARGETS += VISUALMANIFEST
72+
endif
73+
6774
include $(topsrcdir)/config/rules.mk

‎browser/branding/aurora/VisualElementsManifest.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Application
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<VisualElements
4+
DisplayName="@MOZ_APP_DISPLAYNAME@"
5+
Logo="tileresources\VisualElements_logo.png"
6+
SmallLogo="tileresources\VisualElements_smalllogo.png"
7+
ForegroundText="light"
8+
BackgroundColor="#1c112e">
9+
<DefaultTile
10+
ShortName="@MOZ_APP_DISPLAYNAME@"
11+
ShowName="allLogos"
12+
/>
13+
<SplashScreen
14+
Image="tileresources\VisualElements_splashscreen.png" />
15+
</VisualElements>
16+
</Application>

‎browser/branding/nightly/Makefile.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,11 @@ BRANDING_DEST := $(DIST)/branding
6464
BRANDING_TARGET := export
6565
INSTALL_TARGETS += BRANDING
6666

67+
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
68+
VISUALMANIFEST := VisualElementsManifest.xml
69+
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
70+
VISUALMANIFEST_PATH := $(DIST)/bin
71+
PP_TARGETS += VISUALMANIFEST
72+
endif
73+
6774
include $(topsrcdir)/config/rules.mk

‎browser/branding/nightly/VisualElementsManifest.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Application
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<VisualElements
4+
DisplayName="@MOZ_APP_DISPLAYNAME@"
5+
Logo="tileresources\VisualElements_logo.png"
6+
SmallLogo="tileresources\VisualElements_smalllogo.png"
7+
ForegroundText="light"
8+
BackgroundColor="#001226">
9+
<DefaultTile
10+
ShortName="@MOZ_APP_DISPLAYNAME@"
11+
ShowName="allLogos"
12+
/>
13+
<SplashScreen
14+
Image="tileresources\VisualElements_splashscreen.png" />
15+
</VisualElements>
16+
</Application>

‎browser/branding/official/Makefile.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,11 @@ BRANDING_DEST := $(DIST)/branding
6464
BRANDING_TARGET := export
6565
INSTALL_TARGETS += BRANDING
6666

67+
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
68+
VISUALMANIFEST := VisualElementsManifest.xml
69+
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
70+
VISUALMANIFEST_PATH := $(DIST)/bin
71+
PP_TARGETS += VISUALMANIFEST
72+
endif
73+
6774
include $(topsrcdir)/config/rules.mk

browser/metro/shell/VisualElementsManifest.xml.in renamed to browser/branding/official/VisualElementsManifest.xml

File renamed without changes.

‎browser/branding/unofficial/Makefile.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,11 @@ BRANDING_DEST := $(DIST)/branding
6464
BRANDING_TARGET := export
6565
INSTALL_TARGETS += BRANDING
6666

67+
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
68+
VISUALMANIFEST := VisualElementsManifest.xml
69+
VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
70+
VISUALMANIFEST_PATH := $(DIST)/bin
71+
PP_TARGETS += VISUALMANIFEST
72+
endif
73+
6774
include $(topsrcdir)/config/rules.mk

‎browser/branding/unofficial/VisualElementsManifest.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Application
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<VisualElements
4+
DisplayName="@MOZ_APP_DISPLAYNAME@"
5+
Logo="tileresources\VisualElements_logo.png"
6+
SmallLogo="tileresources\VisualElements_smalllogo.png"
7+
ForegroundText="light"
8+
BackgroundColor="#001226">
9+
<DefaultTile
10+
ShortName="@MOZ_APP_DISPLAYNAME@"
11+
ShowName="allLogos"
12+
/>
13+
<SplashScreen
14+
Image="tileresources\VisualElements_splashscreen.png" />
15+
</VisualElements>
16+
</Application>

‎browser/devtools/debugger/test/browser_dbg_chrome-debugging.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
var gClient = null;
1010
var gTab = null;
11+
var gHomeTab = null;
1112
var gThreadClient = null;
1213
var gNewGlobal = false;
1314
var gAttached = false;
@@ -33,8 +34,7 @@ function test()
3334
gAttached = true;
3435

3536
// Ensure that a new global will be created.
36-
let frame = content.document.createElement("iframe");
37-
content.document.querySelector("body").appendChild(frame);
37+
gHomeTab = gBrowser.addTab("about:home");
3838

3939
finish_test();
4040
});
@@ -58,6 +58,7 @@ function finish_test()
5858
}
5959
gClient.removeListener("newScript", onNewScript);
6060
gThreadClient.resume(function(aResponse) {
61+
removeTab(gHomeTab);
6162
removeTab(gTab);
6263
gClient.close(function() {
6364
ok(gNewGlobal, "Received newGlobal event.");

0 commit comments

Comments
 (0)