Skip to content

Commit

Permalink
[Temporary On will revert on Fri]UI impl side painting default on
Browse files Browse the repository at this point in the history
Turn on Impl Side Painting on Aura browser compositor by default
and add a disable compositor switch.

Temporarily turn on this patch to flush out potential bugs. Will
revert on Friday.

R=danakj
BUG=314185

Review URL: https://codereview.chromium.org/962833003

Cr-Commit-Position: refs/heads/master@{#325985}
  • Loading branch information
weiliangc authored and Commit bot committed Apr 21, 2015
1 parent 0e7b421 commit ee6eff9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ void ScreenshotTestingMixin::SetUpInProcessBrowserTestFixture() {
void ScreenshotTestingMixin::SetUpCommandLine(base::CommandLine* command_line) {
if (enable_test_screenshots_) {
command_line->AppendSwitch(switches::kEnablePixelOutputInTests);
command_line->AppendSwitch(switches::kUIEnableImplSidePainting);
} else {
command_line->AppendSwitch(switches::kUIDisableImplSidePainting);
}
}

Expand Down
5 changes: 3 additions & 2 deletions ui/compositor/compositor_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const char kUIDisableThreadedCompositing[] = "ui-disable-threaded-compositing";
const char kUIEnableCompositorAnimationTimelines[] =
"ui-enable-compositor-animation-timelines";

const char kUIEnableImplSidePainting[] = "ui-enable-impl-side-painting";
const char kUIDisableImplSidePainting[] = "ui-disable-impl-side-painting";

const char kUIEnableSlimmingPaint[] = "ui-enable-slimming-paint";

Expand All @@ -35,7 +35,8 @@ namespace ui {
bool IsUIImplSidePaintingEnabled() {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
return command_line.HasSwitch(switches::kUIEnableImplSidePainting);

return !command_line.HasSwitch(switches::kUIDisableImplSidePainting);
}

bool IsUIZeroCopyEnabled() {
Expand Down
2 changes: 1 addition & 1 deletion ui/compositor/compositor_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ COMPOSITOR_EXPORT extern const char kEnableHardwareOverlays[];
COMPOSITOR_EXPORT extern const char kEnablePixelOutputInTests[];
COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[];
COMPOSITOR_EXPORT extern const char kUIEnableCompositorAnimationTimelines[];
COMPOSITOR_EXPORT extern const char kUIEnableImplSidePainting[];
COMPOSITOR_EXPORT extern const char kUIEnableSlimmingPaint[];
COMPOSITOR_EXPORT extern const char kUIDisableImplSidePainting[];
COMPOSITOR_EXPORT extern const char kUIEnableZeroCopy[];
COMPOSITOR_EXPORT extern const char kUIShowPaintRects[];

Expand Down

0 comments on commit ee6eff9

Please sign in to comment.