Index: webkit/plugins/npapi/webplugin_delegate_impl_mac.mm |
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm |
index 462f5cb5f3a6eabbb50a5696b6859f3bea171439..44d0de1a1f498e4a88306abfe499ad70f5419b8e 100644 |
--- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm |
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm |
@@ -17,6 +17,7 @@ |
#include "base/string_util.h" |
#include "base/sys_string_conversions.h" |
#include "base/utf_string_conversions.h" |
+#include "skia/ext/skia_utils_mac.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
#include "webkit/plugins/npapi/plugin_instance.h" |
@@ -25,10 +26,6 @@ |
#include "webkit/plugins/npapi/webplugin.h" |
#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h" |
-#if defined(USE_SKIA) |
-#include "skia/ext/skia_utils_mac.h" |
-#endif |
- |
using WebKit::WebCursorInfo; |
using WebKit::WebKeyboardEvent; |
using WebKit::WebInputEvent; |
@@ -286,12 +283,8 @@ void WebPluginDelegateImpl::UpdateGeometryAndContext( |
void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas, |
const gfx::Rect& rect) { |
-#if defined(USE_SKIA) |
gfx::SkiaBitLocker bit_locker(canvas); |
CGContextRef context = bit_locker.cgContext(); |
-#else |
- CGContextRef context = canvas; |
-#endif |
CGPaint(context, rect); |
} |