summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rwxr-xr-x[-rw-r--r--]chrome/browser/gtk/download_item_gtk.cc2
-rwxr-xr-x[-rw-r--r--]chrome/browser/gtk/sad_tab_gtk.cc2
-rwxr-xr-x[-rw-r--r--]chrome/browser/gtk/tabs/tab_renderer_gtk.cc3
-rwxr-xr-x[-rw-r--r--]chrome/browser/gtk/tabs/tab_strip_gtk.cc2
-rw-r--r--chrome/browser/printing/printed_document.cc2
-rw-r--r--chrome/browser/printing/printing_layout_uitest.cc2
-rw-r--r--chrome/browser/printing/win_printing_context.cc2
-rwxr-xr-x[-rw-r--r--]chrome/browser/tab_contents/tab_contents_view_win.cc2
-rw-r--r--chrome/browser/views/theme_helpers.cc4
-rw-r--r--chrome/plugin/webplugin_delegate_stub.cc2
-rw-r--r--chrome/plugin/webplugin_proxy.cc2
-rw-r--r--chrome/renderer/mock_printer_driver_win.cc2
-rw-r--r--chrome/renderer/print_web_view_helper.cc4
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc2
14 files changed, 17 insertions, 16 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 1f0d814..0972513 100644..100755
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/gtk/download_item_gtk.h"
#include "app/l10n_util.h"
-#include "app/gfx/canvas.h"
+#include "app/gfx/canvas_paint.h"
#include "app/gfx/font.h"
#include "app/gfx/text_elider.h"
#include "app/resource_bundle.h"
diff --git a/chrome/browser/gtk/sad_tab_gtk.cc b/chrome/browser/gtk/sad_tab_gtk.cc
index 546cc9e..82fe8f2 100644..100755
--- a/chrome/browser/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/gtk/sad_tab_gtk.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "app/gfx/canvas.h"
+#include "app/gfx/canvas_paint.h"
#include "app/gfx/font.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 0e8e873..112f33a 100644..100755
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/gtk/tabs/tab_renderer_gtk.h"
+#include "app/gfx/canvas_paint.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "chrome/browser/browser.h"
@@ -510,7 +511,7 @@ void TabRendererGtk::MoveCloseButtonWidget() {
void TabRendererGtk::PaintTab(GdkEventExpose* event) {
gfx::CanvasPaint canvas(event, false);
- if (canvas.isEmpty())
+ if (canvas.is_empty())
return;
// The tab is rendered into a windowless widget whose offset is at the
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 2b95e74..89a8fdc 100644..100755
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
-#include "app/gfx/canvas.h"
+#include "app/gfx/canvas_paint.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "app/slide_animation.h"
diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index 6b01244..f330070 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -103,7 +103,7 @@ void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
// the device context.
int saved_state = SaveDC(context);
DCHECK_NE(saved_state, 0);
- skia::PlatformDeviceWin::InitializeDC(context);
+ skia::PlatformDevice::InitializeDC(context);
{
// Save the state (again) to apply the necessary world transformation.
int saved_state = SaveDC(context);
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 71e29a1..a651a0a 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -169,7 +169,7 @@ class Image {
&bits, NULL, 0);
EXPECT_TRUE(bitmap);
EXPECT_TRUE(SelectObject(hdc, bitmap));
- skia::PlatformDeviceWin::InitializeDC(hdc);
+ skia::PlatformDevice::InitializeDC(hdc);
EXPECT_TRUE(emf.Playback(hdc, NULL));
row_length_ = size_.width() * sizeof(uint32);
size_t bytes = row_length_ * size_.height();
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index 23462af..6866800 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -384,7 +384,7 @@ bool PrintingContext::InitializeSettings(const DEVMODE& dev_mode,
const PRINTPAGERANGE* ranges,
int number_ranges,
bool selection_only) {
- skia::PlatformDeviceWin::InitializeDC(hdc_);
+ skia::PlatformDevice::InitializeDC(hdc_);
DCHECK(GetDeviceCaps(hdc_, CLIPCAPS));
DCHECK(GetDeviceCaps(hdc_, RASTERCAPS) & RC_STRETCHDIB);
DCHECK(GetDeviceCaps(hdc_, RASTERCAPS) & RC_BITMAP64);
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc
index fcb05d9..37e590d 100644..100755
--- a/chrome/browser/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_win.cc
@@ -6,7 +6,7 @@
#include <windows.h>
-#include "app/gfx/canvas.h"
+#include "app/gfx/canvas_paint.h"
#include "app/os_exchange_data.h"
#include "chrome/browser/bookmarks/bookmark_drag_data.h"
#include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index 7d4375d..1d63ea6 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -64,8 +64,8 @@ void GetRebarGradientColors(int width, int x1, int x2,
// 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::BitmapPlatformDeviceWin& device =
- static_cast<skia::BitmapPlatformDeviceWin&>(
+ skia::BitmapPlatformDevice& device =
+ static_cast<skia::BitmapPlatformDevice&>(
canvas.getTopPlatformDevice());
*c1 = 0xFF000000 | device.getColorAt(x1, 0);
*c2 = 0xFF000000 | device.getColorAt(x2, 0);
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 2188627..800db41 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -236,7 +236,7 @@ void WebPluginDelegateStub::OnPrint(base::SharedMemoryHandle* shared_memory,
return;
}
HDC hdc = emf.hdc();
- skia::PlatformDeviceWin::InitializeDC(hdc);
+ skia::PlatformDevice::InitializeDC(hdc);
delegate_->Print(hdc);
if (!emf.CloseDc()) {
NOTREACHED();
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index a0fd2ab..286659b 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -476,7 +476,7 @@ void WebPluginProxy::ConvertBuffer(const base::SharedMemoryHandle& buffer,
return;
}
- skia::PlatformDeviceWin::InitializeDC(hdc->Get());
+ skia::PlatformDevice::InitializeDC(hdc->Get());
SelectObject(hdc->Get(), bitmap->Get());
}
diff --git a/chrome/renderer/mock_printer_driver_win.cc b/chrome/renderer/mock_printer_driver_win.cc
index 4232019..051838b 100644
--- a/chrome/renderer/mock_printer_driver_win.cc
+++ b/chrome/renderer/mock_printer_driver_win.cc
@@ -75,7 +75,7 @@ class EmfRenderer {
SelectObject(dc_, bitmap_);
- skia::PlatformDeviceWin::InitializeDC(dc_);
+ skia::PlatformDevice::InitializeDC(dc_);
emf->Playback(dc_, NULL);
return reinterpret_cast<uint8*>(bits);
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index c5125e8..d281a76 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -204,7 +204,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
emf.CreateDc(NULL, NULL);
HDC hdc = emf.hdc();
DCHECK(hdc);
- skia::PlatformDeviceWin::InitializeDC(hdc);
+ skia::PlatformDevice::InitializeDC(hdc);
// Since WebKit extends the page width depending on the magical shrink
// factor we make sure the canvas covers the worst case scenario
// (x2.0 currently). PrintContext will then set the correct clipping region.
@@ -220,7 +220,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
// GDI drawing code fails.
// Mix of Skia and GDI based.
- skia::PlatformCanvasWin canvas(size_x, size_y, true);
+ skia::PlatformCanvas canvas(size_x, size_y, true);
canvas.drawARGB(255, 255, 255, 255, SkPorterDuff::kSrc_Mode);
float webkit_shrink = frame->PrintPage(params.page_number, &canvas);
if (shrink <= 0) {
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index b00687c..87d3ec1 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -432,7 +432,7 @@ bool WebPluginDelegateProxy::CreateBitmap(
if (!new_shared_memory->Create(L"", false, true, size))
return false;
- scoped_ptr<skia::PlatformCanvasWin> new_canvas(new skia::PlatformCanvasWin);
+ scoped_ptr<skia::PlatformCanvas> new_canvas(new skia::PlatformCanvas);
if (!new_canvas->initialize(plugin_rect_.width(), plugin_rect_.height(),
true, new_shared_memory->handle())) {
return false;
generated by cgit v1.1 at 2025-01-19 06:22:34 +0000