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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/theme_helpers.cc

Issue 7019013: Removal of dependencies on PlatformDevice classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove unnecessary headers. Created 9 years, 7 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
« chrome/browser/renderer_host/render_widget_host_view_win.cc ('K') | « chrome/browser/ui/views/tabs/native_view_photobooth_win.cc ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | skia/ext/platform_canvas.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/theme_helpers.cc
===================================================================
--- chrome/browser/ui/views/theme_helpers.cc (revision 85672)
+++ chrome/browser/ui/views/theme_helpers.cc (working copy)
@@ -9,7 +9,6 @@
#include <atltheme.h>
#include "base/logging.h"
-#include "skia/ext/bitmap_platform_device_win.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "ui/gfx/canvas_skia.h"
@@ -64,11 +63,10 @@
// Extract the color values from the selected pixels
// The | in the following operations forces the alpha to 0xFF. This is
// needed as windows sets the alpha to 0 when it renders.
- skia::BitmapPlatformDevice& device =
- static_cast<skia::BitmapPlatformDevice&>(
- canvas.getTopPlatformDevice());
- *c1 = 0xFF000000 | device.getColorAt(x1, 0);
- *c2 = 0xFF000000 | device.getColorAt(x2, 0);
+ SkDevice& device = canvas.getTopDevice();
+
+ *c1 = 0xFF000000 | skia::platform_util::GetColorAt(&device, x1, 0);
+ *c2 = 0xFF000000 | skia::platform_util::GetColorAt(&device, x2, 0);
}
void GetDarkLineColor(SkColor* dark_color) {
« chrome/browser/renderer_host/render_widget_host_view_win.cc ('K') | « chrome/browser/ui/views/tabs/native_view_photobooth_win.cc ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | skia/ext/platform_canvas.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698