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
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user