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

Unified Diff: skia/ext/platform_canvas.h

Issue 2622713002: Remove bitmap_platform_device_skia (Closed)
Patch Set: Win build fix Created 3 years, 11 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
« no previous file with comments | « skia/ext/bitmap_platform_device_win.cc ('k') | skia/ext/platform_canvas.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/platform_canvas.h
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index dea8ae824057eef53d2063990db6ecd59ee21263..11bc398a92d8041699b6496a3b7ad10707599bcc 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -14,10 +14,9 @@
#include "skia/ext/native_drawing_context.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPixelRef.h"
-#include "third_party/skia/include/core/SkPixmap.h"
-class SkBaseDevice;
+class SkCanvas;
+class SkPixmap;
// A PlatformCanvas is a software-rasterized SkCanvas which is *also*
// addressable by the platform-specific drawing API (GDI, Core Graphics,
@@ -74,14 +73,11 @@ static inline std::unique_ptr<SkCanvas> CreatePlatformCanvas(int width,
return CreatePlatformCanvasWithSharedSection(width, height, is_opaque, 0,
CRASH_ON_FAILURE);
#else
- return CreatePlatformCanvasWithPixels(width, height, is_opaque, 0,
+ return CreatePlatformCanvasWithPixels(width, height, is_opaque, nullptr,
CRASH_ON_FAILURE);
#endif
}
-SK_API std::unique_ptr<SkCanvas> CreateCanvas(const sk_sp<SkBaseDevice>& device,
- OnFailureType failure_type);
-
static inline std::unique_ptr<SkCanvas> TryCreateBitmapCanvas(int width,
int height,
bool is_opaque) {
@@ -89,7 +85,7 @@ static inline std::unique_ptr<SkCanvas> TryCreateBitmapCanvas(int width,
return CreatePlatformCanvasWithSharedSection(width, height, is_opaque, 0,
RETURN_NULL_ON_FAILURE);
#else
- return CreatePlatformCanvasWithPixels(width, height, is_opaque, 0,
+ return CreatePlatformCanvasWithPixels(width, height, is_opaque, nullptr,
RETURN_NULL_ON_FAILURE);
#endif
}
« no previous file with comments | « skia/ext/bitmap_platform_device_win.cc ('k') | skia/ext/platform_canvas.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698