diff options
| -rw-r--r-- | chromium/plat_support/graphics_utils.cpp | 22 | ||||
| -rw-r--r-- | nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java | 4 |
2 files changed, 8 insertions, 18 deletions
diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp index 5d8d0a5..89beb75 100644 --- a/chromium/plat_support/graphics_utils.cpp +++ b/chromium/plat_support/graphics_utils.cpp @@ -38,15 +38,15 @@ namespace { class PixelInfo : public AwPixelInfo { public: - explicit PixelInfo(SkCanvas* canvas); + explicit PixelInfo(android::Canvas* canvas); ~PixelInfo(); }; -PixelInfo::PixelInfo(SkCanvas* canvas) { +PixelInfo::PixelInfo(android::Canvas* canvas) { memset(this, 0, sizeof(AwPixelInfo)); version = kAwPixelInfoVersion; - state = SkCanvasStateUtils::CaptureCanvasState(canvas); + state = canvas->captureCanvasState(); } PixelInfo::~PixelInfo() { @@ -59,21 +59,7 @@ AwPixelInfo* GetPixels(JNIEnv* env, jobject java_canvas) { if (!nativeCanvas) return NULL; - SkCanvas* canvas = nativeCanvas->asSkCanvas(); - if (!canvas) - return NULL; - - // Workarounds for http://crbug.com/271096: SW draw only supports - // translate & scale transforms, and a simple rectangular clip. - // (This also avoids significant wasted time in calling - // SkCanvasStateUtils::CaptureCanvasState when the clip is complex). - if (!canvas->isClipRect() || - (canvas->getTotalMatrix().getType() & - ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask))) { - return NULL; - } - - PixelInfo* pixels = new PixelInfo(canvas); + PixelInfo* pixels = new PixelInfo(nativeCanvas); if (!pixels->state) { delete pixels; pixels = NULL; diff --git a/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java index 8132a34..ed12446 100644 --- a/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java +++ b/nullwebview/java/com/android/webview/nullwebview/NullWebViewFactoryProvider.java @@ -31,6 +31,10 @@ import android.webkit.WebViewProvider; public class NullWebViewFactoryProvider implements WebViewFactoryProvider { + public static WebViewFactoryProvider create(WebViewDelegate delegate) { + return new NullWebViewFactoryProvider(delegate); + } + public NullWebViewFactoryProvider(WebViewDelegate delegate) { } |