diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 16:39:12 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 16:39:12 +0000 |
| commit | c8c857f3368cc40cc7eba1c0719a492a0d3002db (patch) | |
| tree | cb960136efc94d93fef59c54ec88e474c352144b /webkit/plugins | |
| parent | 0950d6fe82b4109687864144a6497aa4c710a1f0 (diff) | |
| download | chromium_src-c8c857f3368cc40cc7eba1c0719a492a0d3002db.zip chromium_src-c8c857f3368cc40cc7eba1c0719a492a0d3002db.tar.gz chromium_src-c8c857f3368cc40cc7eba1c0719a492a0d3002db.tar.bz2 | |
Npapi cleanup: USE_SKIA is always true.
We always build with skia now. This change removes dead code, and unnecessary
USE_SKIA guards.
BUG=110881
Review URL: https://chromiumcodereview.appspot.com/12406010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index a69edf4..e8594f8 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); } |