| 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 a69edf4586a2045a9d2b8213f97ca02096def758..e8594f8f5726c9a8f2fa7afe0c20b0f1f57f74f6 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;
|
| @@ -280,12 +277,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);
|
| }
|
|
|
|
|