Title: [90332] trunk/Source/WebKit2
- Revision
- 90332
- Author
- [email protected]
- Date
- 2011-07-02 18:19:24 -0700 (Sat, 02 Jul 2011)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90331 => 90332)
--- trunk/Source/WebKit2/ChangeLog 2011-07-03 01:15:49 UTC (rev 90331)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-03 01:19:24 UTC (rev 90332)
@@ -1,5 +1,15 @@
2011-07-02 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Null out the plug-in controller after destroying the plug-in.
https://bugs.webkit.org/show_bug.cgi?id=63869
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (90331 => 90332)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-07-03 01:15:49 UTC (rev 90331)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-07-03 01:19:24 UTC (rev 90332)
@@ -70,7 +70,7 @@
#endif
#elif PLATFORM(WIN)
- HWND containingWindow() const;
+ HWND containingWindow();
#endif
PluginQuirks quirks() const { return m_pluginModule->pluginQuirks(); }
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp (90331 => 90332)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2011-07-03 01:15:49 UTC (rev 90331)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2011-07-03 01:19:24 UTC (rev 90332)
@@ -82,7 +82,7 @@
::RegisterClassW(&windowClass);
}
-HWND NetscapePlugin::containingWindow() const
+HWND NetscapePlugin::containingWindow()
{
return controller()->nativeParentWindow();
}
@@ -322,7 +322,7 @@
if (m_isWindowed)
return false;
- pluginController()->willSendEventToPlugin();
+ controller()->willSendEventToPlugin();
NPEvent npEvent = toNP(event);
NPP_HandleEvent(&npEvent);
@@ -336,7 +336,7 @@
if (m_isWindowed)
return false;
- pluginController()->willSendEventToPlugin();
+ controller()->willSendEventToPlugin();
NPEvent npEvent = toNP(event);
NPP_HandleEvent(&npEvent);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
