summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webframe.h4
-rw-r--r--webkit/glue/webframe_impl.cc14
-rw-r--r--webkit/glue/webframe_impl.h6
-rw-r--r--webkit/glue/webview_impl.cc2
-rw-r--r--webkit/glue/webview_impl.h2
-rw-r--r--webkit/glue/webwidget.h2
-rw-r--r--webkit/glue/webwidget_impl.cc2
-rw-r--r--webkit/glue/webwidget_impl.h2
-rw-r--r--webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp6
-rw-r--r--webkit/port/platform/graphics/chromium/ImageBufferData.h2
-rw-r--r--webkit/port/platform/graphics/skia/ImageSkia.cpp2
-rw-r--r--webkit/port/platform/graphics/skia/PlatformContextSkia.cpp4
-rw-r--r--webkit/port/platform/graphics/skia/PlatformContextSkia.h10
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp6
-rw-r--r--webkit/tools/test_shell/mac/webwidget_host.mm2
-rw-r--r--webkit/tools/test_shell/test_shell.cc2
-rw-r--r--webkit/tools/test_shell/webwidget_host.h2
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc8
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc4
19 files changed, 41 insertions, 41 deletions
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 6235586..f865b0f 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -298,7 +298,7 @@ class WebFrame : public base::RefCounted<WebFrame> {
//
// Returns false on failure. CaptureImage can fail if 'image' argument
// is not valid or due to failure to allocate a canvas.
- virtual bool CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
+ virtual bool CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
bool scroll_to_zero) = 0;
// This function sets a flag within WebKit to instruct it to render the page
@@ -358,7 +358,7 @@ class WebFrame : public base::RefCounted<WebFrame> {
virtual void GetPageRect(int page, gfx::Rect* page_size) const = 0;
// Prints one page. |page| is 0-based.
- virtual bool SpoolPage(int page, gfx::PlatformCanvas* canvas) = 0;
+ virtual bool SpoolPage(int page, skia::PlatformCanvas* canvas) = 0;
// Is this frame reloading with allowing stale data? This will be true when
// the encoding of the page is changed and it needs to be re-interpreted,
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 40a2842..dbcca01 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1421,7 +1421,7 @@ void WebFrameImpl::Layout() {
FromFrame(child)->Layout();
}
-void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebFrameImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) {
static StatsRate rendering("WebFramePaintTime");
StatsScope<StatsRate> rendering_scope(rendering);
@@ -1444,7 +1444,7 @@ void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
}
}
-bool WebFrameImpl::CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
+bool WebFrameImpl::CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
bool scroll_to_zero) {
if (!image) {
NOTREACHED();
@@ -1454,7 +1454,7 @@ bool WebFrameImpl::CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
// Must layout before painting.
Layout();
- gfx::PlatformCanvas canvas;
+ skia::PlatformCanvas canvas;
if (!canvas.initialize(frameview()->width(), frameview()->height(), true))
return false;
@@ -1471,14 +1471,14 @@ bool WebFrameImpl::CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
canvas.endPlatformPaint();
#endif
- gfx::BitmapPlatformDevice& device =
- static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
+ skia::BitmapPlatformDevice& device =
+ static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
#if defined(OS_WIN)
device.fixupAlphaBeforeCompositing();
#endif
- image->reset(new gfx::BitmapPlatformDevice(device));
+ image->reset(new skia::BitmapPlatformDevice(device));
return true;
}
@@ -1781,7 +1781,7 @@ void WebFrameImpl::GetPageRect(int page, gfx::Rect* page_size) const {
*page_size = webkit_glue::FromIntRect(pages_[page]);
}
-bool WebFrameImpl::SpoolPage(int page, gfx::PlatformCanvas* canvas) {
+bool WebFrameImpl::SpoolPage(int page, skia::PlatformCanvas* canvas) {
// Ensure correct state.
if (!printing_ ||
page < 0 ||
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 7530170..b7d6753 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -110,7 +110,7 @@ class WebFrameImpl : public WebFrame {
virtual WebFrame* GetParent() const;
virtual WebFrame* GetChildFrame(const std::wstring& xpath) const;
virtual WebView* GetView() const;
- virtual bool CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image,
+ virtual bool CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
bool scroll_to_zero);
// This method calls createRuntimeObject (in KJS::Bindings::Instance), which
@@ -170,7 +170,7 @@ class WebFrameImpl : public WebFrame {
int* width);
virtual int ComputePageRects(const gfx::Size& page_size_px);
virtual void GetPageRect(int page, gfx::Rect* page_size) const;
- virtual bool SpoolPage(int page, gfx::PlatformCanvas* canvas);
+ virtual bool SpoolPage(int page, skia::PlatformCanvas* canvas);
// Reformats this frame for printing or for screen display, depending on
// |printing| flag. Acts recursively on inner frames.
@@ -184,7 +184,7 @@ class WebFrameImpl : public WebFrame {
// WebFrameImpl
void Layout();
- void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+ void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect);
bool IsLoading();
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 540b654..d4d19fb 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -846,7 +846,7 @@ void WebViewImpl::Layout() {
}
}
-void WebViewImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebViewImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) {
WebFrameImpl* webframe = main_frame();
if (webframe)
webframe->Paint(canvas, rect);
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index e0f693e..5c0a554 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -61,7 +61,7 @@ class WebViewImpl : public WebView {
virtual void Resize(const gfx::Size& new_size);
virtual gfx::Size GetSize() { return size(); }
virtual void Layout();
- virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+ virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect);
virtual bool HandleInputEvent(const WebInputEvent* input_event);
virtual void MouseCaptureLost();
virtual void SetFocus(bool enable);
diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h
index 9995cc2..9d26fb5 100644
--- a/webkit/glue/webwidget.h
+++ b/webkit/glue/webwidget.h
@@ -45,7 +45,7 @@ class WebWidget : public base::RefCounted<WebWidget> {
// multiple times once Layout has been called, assuming no other changes are
// made to the WebWidget (e.g., once events are processed, it should be assumed
// that another call to Layout is warranted before painting again).
- virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) = 0;
+ virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) = 0;
// Called to inform the WebWidget of an input event.
// Returns true if the event has been processed, false otherwise.
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index dfd86d9..55f6d7c 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -121,7 +121,7 @@ void WebWidgetImpl::Resize(const gfx::Size& new_size) {
void WebWidgetImpl::Layout() {
}
-void WebWidgetImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
+void WebWidgetImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) {
if (!widget_)
return;
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 97b08a2..246709b9 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -37,7 +37,7 @@ class WebWidgetImpl : public WebWidget,
virtual void Resize(const gfx::Size& new_size);
virtual gfx::Size GetSize() { return size(); }
virtual void Layout();
- virtual void Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect);
+ virtual void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect);
virtual bool HandleInputEvent(const WebInputEvent* input_event);
virtual void MouseCaptureLost();
virtual void SetFocus(bool enable);
diff --git a/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp b/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
index 0246501..d7c0daa 100644
--- a/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
+++ b/webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
@@ -80,7 +80,7 @@ void ScrollbarThemeChromium::paintTrackPiece(GraphicsContext* gc, Scrollbar* scr
{
bool horz = scrollbar->orientation() == HorizontalScrollbar;
- gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+ skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
RECT paintRect = toRECT(rect);
@@ -111,7 +111,7 @@ void ScrollbarThemeChromium::paintButton(GraphicsContext* gc, Scrollbar* scrollb
{
bool horz = scrollbar->orientation() == HorizontalScrollbar;
- gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+ skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
RECT paintRect = toRECT(rect);
@@ -137,7 +137,7 @@ void ScrollbarThemeChromium::paintThumb(GraphicsContext* gc, Scrollbar* scrollba
{
bool horz = scrollbar->orientation() == HorizontalScrollbar;
- gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
+ skia::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
RECT paintRect = toRECT(rect);
diff --git a/webkit/port/platform/graphics/chromium/ImageBufferData.h b/webkit/port/platform/graphics/chromium/ImageBufferData.h
index 9b46294..f8d3fd3 100644
--- a/webkit/port/platform/graphics/chromium/ImageBufferData.h
+++ b/webkit/port/platform/graphics/chromium/ImageBufferData.h
@@ -43,7 +43,7 @@ class ImageBufferData {
public:
ImageBufferData(const IntSize&);
- gfx::PlatformCanvas m_canvas;
+ skia::PlatformCanvas m_canvas;
// Must be second since this will refer to m_canvas.
PlatformContextSkia m_platformContext;
diff --git a/webkit/port/platform/graphics/skia/ImageSkia.cpp b/webkit/port/platform/graphics/skia/ImageSkia.cpp
index 6314699..972ca0d 100644
--- a/webkit/port/platform/graphics/skia/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/skia/ImageSkia.cpp
@@ -245,7 +245,7 @@ void paintSkBitmap(PlatformContextSkia* platformContext,
SkPaint paint;
paint.setPorterDuffXfermode(compOp);
- gfx::PlatformCanvas* canvas = platformContext->canvas();
+ skia::PlatformCanvas* canvas = platformContext->canvas();
ResamplingMode resampling = platformContext->IsPrinting() ? RESAMPLE_NONE :
computeResamplingMode(bitmap, srcRect.width(), srcRect.height(),
diff --git a/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp b/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
index e691b5b..6cc1c0f 100644
--- a/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/skia/PlatformContextSkia.cpp
@@ -142,7 +142,7 @@ SkColor PlatformContextSkia::State::applyAlpha(SkColor c) const
// PlatformContextSkia ---------------------------------------------------------
// Danger: canvas can be NULL.
-PlatformContextSkia::PlatformContextSkia(gfx::PlatformCanvas* canvas)
+PlatformContextSkia::PlatformContextSkia(skia::PlatformCanvas* canvas)
: m_canvas(canvas)
, m_stateStack(sizeof(State))
{
@@ -163,7 +163,7 @@ PlatformContextSkia::~PlatformContextSkia()
#endif
}
-void PlatformContextSkia::setCanvas(gfx::PlatformCanvas* canvas)
+void PlatformContextSkia::setCanvas(skia::PlatformCanvas* canvas)
{
m_canvas = canvas;
}
diff --git a/webkit/port/platform/graphics/skia/PlatformContextSkia.h b/webkit/port/platform/graphics/skia/PlatformContextSkia.h
index 2e6e4b6..b8dc43f 100644
--- a/webkit/port/platform/graphics/skia/PlatformContextSkia.h
+++ b/webkit/port/platform/graphics/skia/PlatformContextSkia.h
@@ -63,12 +63,12 @@ class PlatformContextSkia {
public:
// For printing, there shouldn't be any canvas. canvas can be NULL. If you
// supply a NULL canvas, you can also call setCanvas later.
- PlatformContextSkia(gfx::PlatformCanvas* canvas);
+ PlatformContextSkia(skia::PlatformCanvas* canvas);
~PlatformContextSkia();
// Sets the canvas associated with this context. Use when supplying NULL
// to the constructor.
- void setCanvas(gfx::PlatformCanvas* canvas);
+ void setCanvas(skia::PlatformCanvas* canvas);
void save();
void restore();
@@ -117,7 +117,7 @@ public:
SkColor fillColor() const;
- gfx::PlatformCanvas* canvas() { return m_canvas; }
+ skia::PlatformCanvas* canvas() { return m_canvas; }
// TODO(brettw) why is this in this class?
void drawRect(SkRect rect);
@@ -132,7 +132,7 @@ public:
// Warning: This function is deprecated so the users are reminded that they
// should use this layer of indirection instead of using the canvas
// directly. This is to help with the eventual serialization.
- gfx::PlatformCanvas* canvas() const;
+ skia::PlatformCanvas* canvas() const;
// Returns if the context is a printing context instead of a display
// context. Bitmap shouldn't be resampled when printing to keep the best
@@ -148,7 +148,7 @@ private:
struct State;
// NULL indicates painting is disabled. Never delete this object.
- gfx::PlatformCanvas* m_canvas;
+ skia::PlatformCanvas* m_canvas;
// States stack. Enables local drawing state change with save()/restore()
// calls.
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 10915a9..1916f99 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -366,7 +366,7 @@ bool RenderThemeWin::paintButton(RenderObject* o,
const ThemeData& themeData = getThemeData(o);
WebCore::ThemeHelperWin helper(i.context, r);
- gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+ skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
int state = themeData.m_state;
@@ -439,7 +439,7 @@ bool RenderThemeWin::paintMenuList(RenderObject* o, const RenderObject::PaintInf
// Get the correct theme data for a textfield and paint the menu.
WebCore::ThemeHelperWin helper(i.context, rect);
- gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+ skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
RECT renderRect = helper.rect();
gfx::NativeTheme::instance()->PaintMenuList(hdc,
@@ -580,7 +580,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o,
const ThemeData& themeData = getThemeData(o);
WebCore::ThemeHelperWin helper(i.context, r);
- gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+ skia::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
COLORREF clr = skia::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index 95c2b92..2050f909 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -157,7 +157,7 @@ void WebWidgetHost::Paint() {
if (!canvas_.get()) {
ResetScrollRect();
paint_rect_ = client_rect;
- canvas_.reset(new gfx::PlatformCanvas(
+ canvas_.reset(new skia::PlatformCanvas(
paint_rect_.width(), paint_rect_.height(), true));
}
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 6367712..4d7404b 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -169,7 +169,7 @@ static void UnitTestAssertHandler(const std::string& str) {
// static
std::string TestShell::DumpImage(WebFrame* web_frame,
const std::wstring& file_name) {
- scoped_ptr<gfx::BitmapPlatformDevice> device;
+ scoped_ptr<skia::BitmapPlatformDevice> device;
if (!web_frame->CaptureImage(&device, true))
return std::string();
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 0b4e197..8498c4f 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -100,7 +100,7 @@ class WebWidgetHost {
gfx::NativeView view_;
WebWidget* webwidget_;
- scoped_ptr<gfx::PlatformCanvas> canvas_;
+ scoped_ptr<skia::PlatformCanvas> canvas_;
// specifies the portion of the webwidget that needs painting
gfx::Rect paint_rect_;
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 2e525b5..f873fa1 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -220,7 +220,7 @@ void WebWidgetHost::Paint() {
if (!canvas_.get()) {
ResetScrollRect();
paint_rect_ = client_rect;
- canvas_.reset(new gfx::PlatformCanvas(width, height, true));
+ canvas_.reset(new skia::PlatformCanvas(width, height, true));
if (!canvas_.get()) {
// memory allocation failed, we can't paint.
LOG(ERROR) << "Failed to allocate memory for " << width << "x" << height;
@@ -262,9 +262,9 @@ void WebWidgetHost::Paint() {
gdk_window_begin_paint_rect(view_->window, &grect);
// BitBlit to the gdk window.
- gfx::PlatformDeviceLinux &platdev = canvas_->getTopPlatformDevice();
- gfx::BitmapPlatformDeviceLinux* const bitdev =
- static_cast<gfx::BitmapPlatformDeviceLinux* >(&platdev);
+ skia::PlatformDeviceLinux &platdev = canvas_->getTopPlatformDevice();
+ skia::BitmapPlatformDeviceLinux* const bitdev =
+ static_cast<skia::BitmapPlatformDeviceLinux* >(&platdev);
cairo_t* cairo_drawable = gdk_cairo_create(view_->window);
cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0);
cairo_paint(cairo_drawable);
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index efe4d8b..3f56002 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved...........
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -213,7 +213,7 @@ void WebWidgetHost::Paint() {
if (!canvas_.get()) {
ResetScrollRect();
paint_rect_ = client_rect;
- canvas_.reset(new gfx::PlatformCanvas(
+ canvas_.reset(new skia::PlatformCanvas(
paint_rect_.width(), paint_rect_.height(), true));
}
generated by cgit v1.1 at 2025-02-13 06:53:05 +0000