Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 539356 - Part 22 - Force a background color when running android reftests. r=roc

Browse Source
This commit is contained in:
Matt Woodrow 2012-06-11 16:45:39 +12:00
parent e2b0e9efbb
commit 3e82706e65
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/tools/reftest/reftest.js
View File

@ -260,6 +260,10 @@ function InitAndStartRefTests()
} catch(e) {
gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | | EXCEPTION: " + e + "\n");
}
try {
prefs.setBoolPref("android.widget_paints_background", false);
} catch (e) {}
/* set the gLoadTimeout */
try {

2
widget/android/nsLookAndFeel.cpp
View File

@ -98,7 +98,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
// (except here at least TextSelectBackground and TextSelectForeground)
// The CSS2 colors below are used.
case eColorID_WindowBackground:
aColor = mSystemColors.colorBackground;
aColor = NS_RGB(0xFF, 0xFF, 0xFF);
break;
case eColorID_WindowForeground:
aColor = mSystemColors.textColorPrimary;

19
widget/android/nsWindow.cpp
View File

@ -2237,6 +2237,10 @@ nsWindow::DrawWindowUnderlay(LayerManager* aManager, nsIntRect aRect)
AndroidGeckoLayerClient& client = AndroidBridge::Bridge()->GetLayerClient();
if (!client.CreateFrame(&jniFrame, mLayerRendererFrame)) return;
if (!WidgetPaintsBackground())
return;
if (!client.ActivateProgram(&jniFrame)) return;
if (!mLayerRendererFrame.BeginDrawing(&jniFrame)) return;
if (!mLayerRendererFrame.DrawBackground(&jniFrame)) return;
@ -2306,5 +2310,20 @@ nsWindow::ScheduleResumeComposition(int width, int height)
}
}
bool
nsWindow::WidgetPaintsBackground()
{
static bool sWidgetPaintsBackground = true;
static bool sWidgetPaintsBackgroundPrefCached = false;
if (!sWidgetPaintsBackgroundPrefCached) {
sWidgetPaintsBackgroundPrefCached = true;
mozilla::Preferences::AddBoolVarCache(&sWidgetPaintsBackground,
"android.widget_paints_background");
}
return sWidgetPaintsBackground;
}
#endif

2
widget/android/nsWindow.h
View File

@ -159,7 +159,7 @@ public:
static void SchedulePauseComposition();
static void ScheduleResumeComposition(int width, int height);
virtual bool WidgetPaintsBackground() { return true; }
virtual bool WidgetPaintsBackground();
#endif
protected: