Fix some of the more common chromium-style errors on the mac clang builder.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/6525038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75141 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 8 deletions

diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/plugins/npapi/plugin_instance.h
index a30303f..f809ffb 100644
--- a/webkit/plugins/npapi/plugin_instance.h
+++ b/webkit/plugins/npapi/plugin_instance.h
@@ -355,13 +355,9 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
 // lifetime of the object, then NULL when it goes out of scope.
 class ScopedCurrentPluginEvent {
  public:
-  ScopedCurrentPluginEvent(PluginInstance* instance, NPCocoaEvent* event)
-      : instance_(instance) {
-    instance_->set_currently_handled_event(event);
-  }
-  ~ScopedCurrentPluginEvent() {
-    instance_->set_currently_handled_event(NULL);
-  }
+  ScopedCurrentPluginEvent(PluginInstance* instance, NPCocoaEvent* event);
+  ~ScopedCurrentPluginEvent();
+
  private:
   scoped_refptr<PluginInstance> instance_;
   DISALLOW_COPY_AND_ASSIGN(ScopedCurrentPluginEvent);
diff --git a/webkit/plugins/npapi/plugin_instance_mac.mm b/webkit/plugins/npapi/plugin_instance_mac.mm
index bbcef8a..05dd46e 100644
--- a/webkit/plugins/npapi/plugin_instance_mac.mm
+++ b/webkit/plugins/npapi/plugin_instance_mac.mm
@@ -130,5 +130,15 @@ NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   return return_val;
 }
 
+ScopedCurrentPluginEvent::ScopedCurrentPluginEvent(PluginInstance* instance,
+                                                   NPCocoaEvent* event)
+    : instance_(instance) {
+  instance_->set_currently_handled_event(event);
+}
+
+ScopedCurrentPluginEvent::~ScopedCurrentPluginEvent() {
+  instance_->set_currently_handled_event(NULL);
+}
+
 }  // namespace npapi
 }  // namespace webkit
diff --git a/webkit/plugins/npapi/webplugin.cc b/webkit/plugins/npapi/webplugin.cc
index cfe2ff1..bf0d65b 100644
--- a/webkit/plugins/npapi/webplugin.cc
+++ b/webkit/plugins/npapi/webplugin.cc
@@ -25,6 +25,12 @@ bool WebPluginGeometry::Equals(const WebPluginGeometry& rhs) const {
          visible == rhs.visible;
 }
 
+#if defined(OS_MACOSX)
+WebPluginAcceleratedSurface* WebPlugin::GetAcceleratedSurface() {
+  return NULL;
+}
+#endif
+
 WebPluginDelegate* WebPlugin::delegate() {
   return NULL;
 }
diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h
index faf9a70..4a89e43 100644
--- a/webkit/plugins/npapi/webplugin.h
+++ b/webkit/plugins/npapi/webplugin.h
@@ -166,7 +166,7 @@ class WebPlugin {
   virtual void BindFakePluginWindowHandle(bool opaque) {}
 
   // Returns the accelerated surface abstraction for accelerated plugins.
-  virtual WebPluginAcceleratedSurface* GetAcceleratedSurface() { return NULL; }
+  virtual WebPluginAcceleratedSurface* GetAcceleratedSurface();
 #endif
 
   // Gets the WebPluginDelegate that implements the interface.