Have another go at fixing the Windows build.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Jul 2011 01:19:24 +0000 (01:19 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Jul 2011 01:19:24 +0000 (01:19 +0000)
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
(WebKit::NetscapePlugin::containingWindow):
(WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
(WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@90332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp

index 3c88b47..bd97fe8 100644 (file)
@@ -1,5 +1,15 @@
 2011-07-02  Anders Carlsson  <andersca@apple.com>
 
+        Have another go at fixing the Windows build.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
+        (WebKit::NetscapePlugin::containingWindow):
+        (WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
+        (WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
+
+2011-07-02  Anders Carlsson  <andersca@apple.com>
+
         Null out the plug-in controller after destroying the plug-in.
         https://bugs.webkit.org/show_bug.cgi?id=63869
 
index 5b7b182..a8dfda3 100644 (file)
@@ -70,7 +70,7 @@ public:
 #endif
 
 #elif PLATFORM(WIN)
-    HWND containingWindow() const;
+    HWND containingWindow();
 #endif
 
     PluginQuirks quirks() const { return m_pluginModule->pluginQuirks(); }
index 90a86f2..60913d8 100644 (file)
@@ -82,7 +82,7 @@ static void registerPluginView()
     ::RegisterClassW(&windowClass);
 }
 
-HWND NetscapePlugin::containingWindow() const
+HWND NetscapePlugin::containingWindow()
 {
     return controller()->nativeParentWindow();
 }
@@ -322,7 +322,7 @@ bool NetscapePlugin::platformHandleMouseEnterEvent(const WebMouseEvent& event)
     if (m_isWindowed)
         return false;
 
-    pluginController()->willSendEventToPlugin();
+    controller()->willSendEventToPlugin();
 
     NPEvent npEvent = toNP(event);
     NPP_HandleEvent(&npEvent);
@@ -336,7 +336,7 @@ bool NetscapePlugin::platformHandleMouseLeaveEvent(const WebMouseEvent& event)
     if (m_isWindowed)
         return false;
 
-    pluginController()->willSendEventToPlugin();
+    controller()->willSendEventToPlugin();
 
     NPEvent npEvent = toNP(event);
     NPP_HandleEvent(&npEvent);