Title: [184182] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 184182
- Author
- [email protected]
- Date
- 2015-05-12 02:00:00 -0700 (Tue, 12 May 2015)
Log Message
Merge r183941 - Add PLUGIN_ARCHITECTURE(X11) around m_frameRectInWindowCoordinates in NetscapePlugin.
https://bugs.webkit.org/show_bug.cgi?id=144490
Patch by Sungmann Cho <[email protected]> on 2015-05-07
Reviewed by Darin Adler.
m_frameRectInWindowCoordinates in NetscapePlugin is currently being used only for
the windowed plugins, and the windowed plugins are only supported on X11. So we can
guard it with PLUGIN_ARCHITECTURE(X11).
No new tests, no behavior change.
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::geometryDidChange):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (184181 => 184182)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-12 08:57:58 UTC (rev 184181)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-12 09:00:00 UTC (rev 184182)
@@ -1,3 +1,20 @@
+2015-05-07 Sungmann Cho <[email protected]>
+
+ Add PLUGIN_ARCHITECTURE(X11) around m_frameRectInWindowCoordinates in NetscapePlugin.
+ https://bugs.webkit.org/show_bug.cgi?id=144490
+
+ Reviewed by Darin Adler.
+
+ m_frameRectInWindowCoordinates in NetscapePlugin is currently being used only for
+ the windowed plugins, and the windowed plugins are only supported on X11. So we can
+ guard it with PLUGIN_ARCHITECTURE(X11).
+
+ No new tests, no behavior change.
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::geometryDidChange):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+
2015-05-07 Ada Chan <[email protected]>
Fix a couple of cases where the backForwardListState's currentIndex is not set correctly in WebBackForwardList::backForwardListState().
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (184181 => 184182)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-05-12 08:57:58 UTC (rev 184181)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-05-12 09:00:00 UTC (rev 184182)
@@ -759,8 +759,10 @@
m_clipRect = clipRect;
m_pluginToRootViewTransform = pluginToRootViewTransform;
+#if PLUGIN_ARCHITECTURE(X11)
IntPoint frameRectLocationInWindowCoordinates = m_pluginToRootViewTransform.mapPoint(IntPoint());
m_frameRectInWindowCoordinates = IntRect(frameRectLocationInWindowCoordinates, m_pluginSize);
+#endif
platformGeometryDidChange();
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (184181 => 184182)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-05-12 08:57:58 UTC (rev 184181)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-05-12 09:00:00 UTC (rev 184182)
@@ -291,8 +291,9 @@
// A transform that can be used to convert from root view coordinates to plug-in coordinates.
WebCore::AffineTransform m_pluginToRootViewTransform;
- // FIXME: Get rid of these.
+#if PLUGIN_ARCHITECTURE(X11)
WebCore::IntRect m_frameRectInWindowCoordinates;
+#endif
CString m_userAgent;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
