591139 - Disable hardware acceleration in safe mode

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Joe Drew (not getting mail)]

Attachment: Disable hw accel in safe mode

We need to disable all hardware acceleration when we are in safe mode.

Comment 1

[Bas Schouten (:bas.schouten)]

Comment on attachment 469740 [details] [diff] [review]
Disable hw accel in safe mode

We should followup with putting all the enable acceleration or not logic in a single function on nsBaseWidget, but for now this is fine.

Comment 2

[Joe Drew (not getting mail)]

http://hg.mozilla.org/mozilla-central/rev/52546421427a

Comment 3

[[e-mail]]

Comment on attachment 469740 [details] [diff] [review]
Disable hw accel in safe mode

>#ifdef CAIRO_HAS_D2D_SURFACE
>    NS_RegisterMemoryReporter(new D2DCacheReporter());
>     NS_RegisterMemoryReporter(new D2DVRAMReporter());
>     mD2DDevice = NULL;
> 
>     PRBool d2dDisabled = PR_FALSE;
>     nsresult rv = pref->GetBoolPref("gfx.direct2d.disabled", &d2dDisabled);
>     if (NS_FAILED(rv))
>         d2dDisabled = PR_FALSE;
> 
>-    if (isVistaOrHigher && !d2dDisabled) {
>+    nsCOMPtr<nsIXULRuntime> xr = do_GetService("@mozilla.org/xre/runtime;1");
>+    PRBool safeMode = PR_FALSE;
>+    if (xr)
>+      xr->GetInSafeMode(&safeMode);
...
> #endif
> 
>     PRInt32 rmode;
>-    if (NS_SUCCEEDED(pref->GetIntPref("mozilla.widget.render-mode", &rmode))) {
>+    if (!safeMode &&
>+	NS_SUCCEEDED(pref->GetIntPref("mozilla.widget.render-mode", &rmode))) {
Sadly safeMode is only defined if CAIRO_HAS_D2D_SURFACE is ...

Comment 4

[Justin Wood (:Callek)]

Attachment: Fix bustage when CAIRO_HAS_D2D_SURFACE is not defined

in the likely chance this is not reviewed in the next hour, I'll appreciate someone landing for me during the day on Sunday, I provided a pre-emptive checkin comment for that task.

Comment 5

[Justin Wood (:Callek)]

Attachment: rebased