Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Unified Diff: webkit/plugins/npapi/webplugin_delegate_impl.h

Issue 8486020: compositor_unittests target is unimplmented on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address kbr's comments (#19) Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webkit/glue/webkit_glue.gypi ('K') | « webkit/glue/webkit_glue.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/webplugin_delegate_impl.h
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h
index a533a1a1882e59e21e3920a14dbd13f12e71d706..45ddf374e71afe8a327bf3b46cade1f3d177ed7e 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h
@@ -167,7 +167,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
bool GetIMEStatus(int* input_type, gfx::Rect* caret_rect);
#endif
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(USE_AURA)
// Informs the plugin that the geometry has changed, as with UpdateGeometry,
// but also includes the new buffer context for that new geometry.
void UpdateGeometryAndContext(const gfx::Rect& window_rect,
@@ -215,7 +215,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
void CGPaint(CGContextRef context, const gfx::Rect& rect);
bool AllowBufferFlipping();
-#endif // OS_MACOSX
+#endif // OS_MACOSX && !USE_AURA
gfx::PluginWindowHandle windowed_handle() const {
return windowed_handle_;
@@ -428,7 +428,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
// Calls SetCapture/ReleaseCapture based on the message type.
static void HandleCaptureForMessage(HWND window, UINT message);
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) && !defined(USE_AURA)
// Sets window_rect_ to |rect|
void SetPluginRect(const gfx::Rect& rect);
// Sets content_area_origin to |origin|
@@ -497,7 +497,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
int keyup_ignore_count_;
scoped_ptr<ExternalDragTracker> external_drag_tracker_;
-#endif // OS_MACOSX
+#endif // OS_MACOSX && !USE_AURA
// Called by the message filter hook when the plugin enters a modal loop.
void OnModalLoopEntered();
« webkit/glue/webkit_glue.gypi ('K') | « webkit/glue/webkit_glue.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698