Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: ui/native_theme/native_theme_win.cc

Issue 2716073002: Remove unused branch in native theme win painting (Closed)
Patch Set: Fix up case statement;add comment Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/native_theme_win.cc
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index e1db2cc36ca4226abc5fe3d3f18428fd610b749a..bac99ec8a8f07fa616fb101d233443483496e9f0 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -276,20 +276,9 @@ void NativeThemeWin::Paint(cc::PaintCanvas* canvas,
extra.menu_item);
return;
default:
- break;
+ PaintIndirect(canvas, part, state, rect, extra);
+ return;
}
-
- HDC surface = skia::GetNativeDrawingContext(canvas);
-
- // When drawing the task manager or the bookmark editor, we draw into an
- // offscreen buffer, where we can use OS-specific drawing routines for
- // UI features like scrollbars. However, we need to set up that buffer,
- // and then read it back when it's done and blit it onto the screen.
-
- if (surface)
- PaintDirect(canvas, surface, part, state, rect, extra);
- else
- PaintIndirect(canvas, part, state, rect, extra);
}
NativeThemeWin::NativeThemeWin()
@@ -677,9 +666,12 @@ void NativeThemeWin::PaintIndirect(SkCanvas* destination_canvas,
const gfx::Rect& rect,
const ExtraParams& extra) const {
// TODO(asvitkine): This path is pretty inefficient - for each paint operation
- // it creates a new offscreen bitmap Skia canvas. This can
- // be sped up by doing it only once per part/state and
- // keeping a cache of the resulting bitmaps.
+ // it creates a new offscreen bitmap Skia canvas. This can be sped up by doing
+ // it only once per part/state and keeping a cache of the resulting bitmaps.
+ //
+ // TODO(enne): This could also potentially be sped up for software raster
+ // by moving these draw ops into PaintRecord itself and then moving the
+ // PaintDirect code to be part of the raster for PaintRecord.
// If this process doesn't have access to GDI, we'd need to use shared memory
// segment instead but that is not supported right now.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698