remove WEBKIT_USING_CG

webkit/plugins/webview_plugin.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/webview_plugin.h"
 
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #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;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebFrame;
 using WebKit::WebImage;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebPlugin;
 using WebKit::WebPluginContainer;
@@ skipping 83 matching lines @@
   return false;
 }
 
 void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
   gfx::Rect paintRect(rect_.Intersect(rect));
   if (paintRect.IsEmpty())
     return;
 
   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.
 void WebViewPlugin::updateGeometry(
     const WebRect& frame_rect, const WebRect& clip_rect,
     const WebVector<WebRect>& cut_out_rects, bool is_visible) {
   if (frame_rect != rect_) {
     rect_ = frame_rect;
     web_view_->resize(WebSize(frame_rect.width, frame_rect.height));
   }
@@ skipping 86 matching lines @@
   return error;
 }
 
 void WebViewPlugin::didReceiveResponse(WebFrame* frame,
                                        unsigned identifier,
                                        const WebURLResponse& response) {
   WebFrameClient::didReceiveResponse(frame, identifier, response);
 }
 
 }  // namespace webkit