diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:08:11 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:08:11 +0000 |
| commit | 9761270755f2fe1fabdf1fadc9a8968b24888973 (patch) | |
| tree | c4b98080636ba5bc4f790522be69ece85a8f3432 /webkit/plugins/webview_plugin.cc | |
| parent | 7431930ddbb9200aad662b7390c04c561a456678 (diff) | |
| download | chromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.zip chromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.tar.gz chromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.tar.bz2 | |
remove WEBKIT_USING_CG
We haven't set WEBKIT_USING_CG for several stable releases and do not intend
to set it again in the forseeable future. This deletes the now-dead code
BUG=none
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/10392018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/webview_plugin.cc')
| -rw-r--r-- | webkit/plugins/webview_plugin.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/webkit/plugins/webview_plugin.cc b/webkit/plugins/webview_plugin.cc index 6ec6ddb..1b0bf8e 100644 --- a/webkit/plugins/webview_plugin.cc +++ b/webkit/plugins/webview_plugin.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -18,12 +19,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webpreferences.h" -#if WEBKIT_USING_CG -#include <CoreGraphics/CGContext.h> -#elif WEBKIT_USING_SKIA -#include "skia/ext/platform_canvas.h" -#endif - using WebKit::WebCanvas; using WebKit::WebCursorInfo; using WebKit::WebDragData; @@ -127,23 +122,13 @@ void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) { paintRect.Offset(-rect_.x(), -rect_.y()); -#if WEBKIT_USING_CG - CGContextRef context = canvas; - CGContextTranslateCTM(context, rect_.x(), rect_.y()); - CGContextSaveGState(context); -#elif WEBKIT_USING_SKIA canvas->translate(SkIntToScalar(rect_.x()), SkIntToScalar(rect_.y())); canvas->save(); -#endif web_view_->layout(); web_view_->paint(canvas, paintRect); -#if WEBKIT_USING_SKIA canvas->restore(); -#elif WEBKIT_USING_CG - CGContextRestoreGState(context); -#endif } // Coordinates are relative to the containing window. |