summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--skia/ext/bitmap_platform_device_linux.cc8
-rw-r--r--skia/ext/bitmap_platform_device_linux.h4
-rw-r--r--skia/ext/bitmap_platform_device_mac.cc8
-rw-r--r--skia/ext/bitmap_platform_device_mac.h4
-rw-r--r--skia/ext/bitmap_platform_device_win.cc8
-rw-r--r--skia/ext/bitmap_platform_device_win.h4
-rw-r--r--skia/ext/platform_canvas.cc2
-rw-r--r--skia/ext/platform_canvas_linux.cc4
-rw-r--r--skia/ext/platform_canvas_mac.cc6
-rw-r--r--skia/ext/platform_canvas_win.cc4
-rw-r--r--skia/ext/vector_canvas.cc2
-rw-r--r--skia/ext/vector_canvas_linux.cc4
-rw-r--r--skia/ext/vector_canvas_win.cc4
-rw-r--r--skia/ext/vector_platform_device.h2
-rw-r--r--skia/ext/vector_platform_device_linux.cc14
-rw-r--r--skia/ext/vector_platform_device_linux.h4
-rw-r--r--skia/ext/vector_platform_device_win.cc14
-rw-r--r--skia/ext/vector_platform_device_win.h4
19 files changed, 51 insertions, 51 deletions
diff --git a/DEPS b/DEPS
index d7416fb9..c912cbb 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "70636",
- "skia_revision": "607",
+ "skia_revision": "621",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "3365",
diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index d976b9c..69f8058 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -37,10 +37,10 @@ void LoadClipToContext(cairo_t* context, const SkRegion& clip) {
} // namespace
-SkDevice* SkBitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque,
- bool isForLayer) {
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ bool isForLayer) {
SkASSERT(config == SkBitmap::kARGB_8888_Config);
return BitmapPlatformDevice::Create(width, height, isOpaque);
}
diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h
index daea4c4..b093414 100644
--- a/skia/ext/bitmap_platform_device_linux.h
+++ b/skia/ext/bitmap_platform_device_linux.h
@@ -43,7 +43,7 @@ typedef struct _cairo_surface cairo_surface_t;
namespace skia {
-class SkBitmapPlatformDeviceFactory : public SkRasterDeviceFactory {
+class BitmapPlatformDeviceFactory : public SkDeviceFactory {
public:
virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
bool isOpaque, bool isForLayer);
@@ -86,7 +86,7 @@ class BitmapPlatformDevice : public PlatformDevice {
BitmapPlatformDevice(const BitmapPlatformDevice& other);
virtual SkDeviceFactory* getDeviceFactory() {
- return SkNEW(SkBitmapPlatformDeviceFactory);
+ return SkNEW(BitmapPlatformDeviceFactory);
}
virtual void makeOpaque(int x, int y, int width, int height);
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index a482283..081986d2d 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -49,10 +49,10 @@ static CGContextRef CGContextForData(void* data, int width, int height) {
} // namespace
-SkDevice* SkBitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque,
- bool isForLayer) {
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ bool isForLayer) {
SkASSERT(config == SkBitmap::kARGB_8888_Config);
return BitmapPlatformDevice::Create(NULL, width, height, isOpaque);
}
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 68c717c..484d923 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -10,7 +10,7 @@
namespace skia {
-class SkBitmapPlatformDeviceFactory : public SkRasterDeviceFactory {
+class BitmapPlatformDeviceFactory : public SkDeviceFactory {
public:
virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
bool isOpaque, bool isForLayer);
@@ -58,7 +58,7 @@ class BitmapPlatformDevice : public PlatformDevice {
virtual ~BitmapPlatformDevice();
virtual SkDeviceFactory* getDeviceFactory() {
- return SkNEW(SkBitmapPlatformDeviceFactory);
+ return SkNEW(BitmapPlatformDeviceFactory);
}
// See warning for copy constructor above.
diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc
index df7e0a2..b7ad13f 100644
--- a/skia/ext/bitmap_platform_device_win.cc
+++ b/skia/ext/bitmap_platform_device_win.cc
@@ -15,10 +15,10 @@
namespace skia {
-SkDevice* SkBitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque,
- bool isForLayer) {
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ bool isForLayer) {
SkASSERT(config == SkBitmap::kARGB_8888_Config);
return BitmapPlatformDevice::create(width, height, isOpaque, NULL);
}
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index 74806b5..af402f4 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -10,7 +10,7 @@
namespace skia {
-class SkBitmapPlatformDeviceFactory : public SkRasterDeviceFactory {
+class BitmapPlatformDeviceFactory : public SkDeviceFactory {
public:
virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
bool isOpaque, bool isForLayer);
@@ -69,7 +69,7 @@ class BitmapPlatformDevice : public PlatformDevice {
BitmapPlatformDevice& operator=(const BitmapPlatformDevice& other);
virtual SkDeviceFactory* getDeviceFactory() {
- return SkNEW(SkBitmapPlatformDeviceFactory);
+ return SkNEW(BitmapPlatformDeviceFactory);
}
// Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
diff --git a/skia/ext/platform_canvas.cc b/skia/ext/platform_canvas.cc
index de0ed13..44b0d16 100644
--- a/skia/ext/platform_canvas.cc
+++ b/skia/ext/platform_canvas.cc
@@ -10,7 +10,7 @@
namespace skia {
PlatformCanvas::PlatformCanvas()
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
}
PlatformCanvas::PlatformCanvas(SkDeviceFactory* factory) : SkCanvas(factory) {
diff --git a/skia/ext/platform_canvas_linux.cc b/skia/ext/platform_canvas_linux.cc
index 5acbd14..8e9db62 100644
--- a/skia/ext/platform_canvas_linux.cc
+++ b/skia/ext/platform_canvas_linux.cc
@@ -13,14 +13,14 @@
namespace skia {
PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
if (!initialize(width, height, is_opaque))
SK_CRASH();
}
PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque,
uint8_t* data)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
if (!initialize(width, height, is_opaque, data))
SK_CRASH();
}
diff --git a/skia/ext/platform_canvas_mac.cc b/skia/ext/platform_canvas_mac.cc
index df3d0ce..7e4c610 100644
--- a/skia/ext/platform_canvas_mac.cc
+++ b/skia/ext/platform_canvas_mac.cc
@@ -10,7 +10,7 @@
namespace skia {
PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
initialize(width, height, is_opaque);
}
@@ -18,7 +18,7 @@ PlatformCanvas::PlatformCanvas(int width,
int height,
bool is_opaque,
CGContextRef context)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
initialize(width, height, is_opaque);
}
@@ -26,7 +26,7 @@ PlatformCanvas::PlatformCanvas(int width,
int height,
bool is_opaque,
uint8_t* data)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
initialize(width, height, is_opaque, data);
}
diff --git a/skia/ext/platform_canvas_win.cc b/skia/ext/platform_canvas_win.cc
index fe63daf..1c9f461 100644
--- a/skia/ext/platform_canvas_win.cc
+++ b/skia/ext/platform_canvas_win.cc
@@ -77,7 +77,7 @@ void CrashIfInvalidSection(HANDLE shared_section) {
#pragma optimize("", on)
PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
bool initialized = initialize(width, height, is_opaque, NULL);
if (!initialized)
CrashForBitmapAllocationFailure(width, height);
@@ -87,7 +87,7 @@ PlatformCanvas::PlatformCanvas(int width,
int height,
bool is_opaque,
HANDLE shared_section)
- : SkCanvas(SkNEW(SkBitmapPlatformDeviceFactory)) {
+ : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
bool initialized = initialize(width, height, is_opaque, shared_section);
if (!initialized) {
CrashIfInvalidSection(shared_section);
diff --git a/skia/ext/vector_canvas.cc b/skia/ext/vector_canvas.cc
index 0c6d306..851da79 100644
--- a/skia/ext/vector_canvas.cc
+++ b/skia/ext/vector_canvas.cc
@@ -7,7 +7,7 @@
namespace skia {
VectorCanvas::VectorCanvas()
- : PlatformCanvas(SkNEW(SkVectorPlatformDeviceFactory)) {
+ : PlatformCanvas(SkNEW(VectorPlatformDeviceFactory)) {
}
VectorCanvas::VectorCanvas(SkDeviceFactory* factory) : PlatformCanvas(factory) {
diff --git a/skia/ext/vector_canvas_linux.cc b/skia/ext/vector_canvas_linux.cc
index f2b8371..aff4fbe 100644
--- a/skia/ext/vector_canvas_linux.cc
+++ b/skia/ext/vector_canvas_linux.cc
@@ -15,8 +15,8 @@ VectorCanvas::VectorCanvas(cairo_t* context, int width, int height) {
}
bool VectorCanvas::initialize(cairo_t* context, int width, int height) {
- SkDevice* device = SkVectorPlatformDeviceFactory::CreateDevice(context, width,
- height, true);
+ SkDevice* device = VectorPlatformDeviceFactory::CreateDevice(context, width,
+ height, true);
if (!device)
return false;
diff --git a/skia/ext/vector_canvas_win.cc b/skia/ext/vector_canvas_win.cc
index d58ebc5..400b2a4 100644
--- a/skia/ext/vector_canvas_win.cc
+++ b/skia/ext/vector_canvas_win.cc
@@ -16,8 +16,8 @@ VectorCanvas::VectorCanvas(HDC dc, int width, int height) {
}
bool VectorCanvas::initialize(HDC context, int width, int height) {
- SkDevice* device = SkVectorPlatformDeviceFactory::CreateDevice(width, height,
- true, context);
+ SkDevice* device = VectorPlatformDeviceFactory::CreateDevice(width, height,
+ true, context);
if (!device)
return false;
diff --git a/skia/ext/vector_platform_device.h b/skia/ext/vector_platform_device.h
index 7888670..1b699d4 100644
--- a/skia/ext/vector_platform_device.h
+++ b/skia/ext/vector_platform_device.h
@@ -15,7 +15,7 @@
#elif defined(__APPLE__)
#include "skia/ext/bitmap_platform_device_mac.h"
namespace skia {
-typedef SkBitmapPlatformDeviceFactory SkVectorPlatformDeviceFactory;
+typedef BitmapPlatformDeviceFactory VectorPlatformDeviceFactory;
} // namespace skia
#endif
diff --git a/skia/ext/vector_platform_device_linux.cc b/skia/ext/vector_platform_device_linux.cc
index 6eae954..3d45596 100644
--- a/skia/ext/vector_platform_device_linux.cc
+++ b/skia/ext/vector_platform_device_linux.cc
@@ -65,18 +65,18 @@ bool IsContextValid(cairo_t* context) {
namespace skia {
-SkDevice* SkVectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque,
- bool isForLayer) {
+SkDevice* VectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ bool isForLayer) {
SkASSERT(config == SkBitmap::kARGB_8888_Config);
return CreateDevice(NULL, width, height, isOpaque);
}
// static
-SkDevice* SkVectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
- int width, int height,
- bool isOpaque) {
+SkDevice* VectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
+ int width, int height,
+ bool isOpaque) {
// TODO(myhuang): Here we might also have similar issues as those on Windows
// (vector_canvas_win.cc, http://crbug.com/18382 & http://crbug.com/18383).
// Please note that is_opaque is true when we use this class for printing.
diff --git a/skia/ext/vector_platform_device_linux.h b/skia/ext/vector_platform_device_linux.h
index 0a2bb83..c6cff16 100644
--- a/skia/ext/vector_platform_device_linux.h
+++ b/skia/ext/vector_platform_device_linux.h
@@ -12,7 +12,7 @@
namespace skia {
-class SkVectorPlatformDeviceFactory : public SkRasterDeviceFactory {
+class VectorPlatformDeviceFactory : public SkDeviceFactory {
public:
virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
bool isOpaque, bool isForLayer);
@@ -34,7 +34,7 @@ class VectorPlatformDevice : public PlatformDevice {
virtual ~VectorPlatformDevice();
virtual SkDeviceFactory* getDeviceFactory() {
- return SkNEW(SkVectorPlatformDeviceFactory);
+ return SkNEW(VectorPlatformDeviceFactory);
}
virtual bool IsVectorial() { return true; }
diff --git a/skia/ext/vector_platform_device_win.cc b/skia/ext/vector_platform_device_win.cc
index e18b156..d9bb8b4 100644
--- a/skia/ext/vector_platform_device_win.cc
+++ b/skia/ext/vector_platform_device_win.cc
@@ -12,18 +12,18 @@
namespace skia {
-SkDevice* SkVectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque,
- bool isForLayer) {
+SkDevice* VectorPlatformDeviceFactory::newDevice(SkBitmap::Config config,
+ int width, int height,
+ bool isOpaque,
+ bool isForLayer) {
SkASSERT(config == SkBitmap::kARGB_8888_Config);
return CreateDevice(width, height, isOpaque, NULL);
}
//static
-SkDevice* SkVectorPlatformDeviceFactory::CreateDevice(int width, int height,
- bool is_opaque,
- HANDLE shared_section) {
+SkDevice* VectorPlatformDeviceFactory::CreateDevice(int width, int height,
+ bool is_opaque,
+ HANDLE shared_section) {
if (!is_opaque) {
// TODO(maruel): http://crbug.com/18382 When restoring a semi-transparent
// layer, i.e. merging it, we need to rasterize it because GDI doesn't
diff --git a/skia/ext/vector_platform_device_win.h b/skia/ext/vector_platform_device_win.h
index 7ee7d549..14b33e5 100644
--- a/skia/ext/vector_platform_device_win.h
+++ b/skia/ext/vector_platform_device_win.h
@@ -12,7 +12,7 @@
namespace skia {
-class SkVectorPlatformDeviceFactory : public SkRasterDeviceFactory {
+class VectorPlatformDeviceFactory : public SkDeviceFactory {
public:
virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
bool isOpaque, bool isForLayer);
@@ -33,7 +33,7 @@ class VectorPlatformDevice : public PlatformDevice {
virtual ~VectorPlatformDevice();
virtual SkDeviceFactory* getDeviceFactory() {
- return SkNEW(SkVectorPlatformDeviceFactory);
+ return SkNEW(VectorPlatformDeviceFactory);
}
virtual HDC getBitmapDC() {
generated by cgit v1.1 at 2025-01-19 00:25:53 +0000