summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 14:51:42 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 14:51:42 +0000
commit78c0df3c5a0ffd85055272693e3f2c83a6642e81 (patch)
tree2fdb00ff491cbc9f377d51c326336ff4aff47ab9
parenta9585718f3a0cbe83fe8deb5eb7dbc86956786e9 (diff)
downloadchromium_src-78c0df3c5a0ffd85055272693e3f2c83a6642e81.zip
chromium_src-78c0df3c5a0ffd85055272693e3f2c83a6642e81.tar.gz
chromium_src-78c0df3c5a0ffd85055272693e3f2c83a6642e81.tar.bz2
skia roll
Review URL: http://codereview.chromium.org/7200003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89666 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/ext/platform_device_linux.cc2
-rw-r--r--skia/ext/platform_device_mac.cc2
-rw-r--r--skia/ext/platform_device_win.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index f43a4fd..b29bc6b 100644
--- a/DEPS
+++ b/DEPS
@@ -16,7 +16,7 @@ vars = {
"libjingle_revision": "66",
"libvpx_revision": "88361",
"ffmpeg_revision": "88382",
- "skia_revision": "1613",
+ "skia_revision": "1642",
"v8_revision": "8294",
"webrtc_revision": "90",
}
diff --git a/skia/ext/platform_device_linux.cc b/skia/ext/platform_device_linux.cc
index 675d19f..f633758 100644
--- a/skia/ext/platform_device_linux.cc
+++ b/skia/ext/platform_device_linux.cc
@@ -7,7 +7,7 @@
namespace skia {
PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
- : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+ : SkDevice(bitmap) {
SetPlatformDevice(this, this);
}
diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc
index da66dbe..9d2695f 100644
--- a/skia/ext/platform_device_mac.cc
+++ b/skia/ext/platform_device_mac.cc
@@ -23,7 +23,7 @@ CGContextRef GetBitmapContext(SkDevice* device) {
}
PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
- : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+ : SkDevice(bitmap) {
SetPlatformDevice(this, this);
}
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index 7fbb746..17e04b2 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -52,7 +52,7 @@ void InitializeDC(HDC context) {
}
PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
- : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+ : SkDevice(bitmap) {
SetPlatformDevice(this, this);
}