Merge r183941 - Add PLUGIN_ARCHITECTURE(X11) around m_frameRectInWind…

…owCoordinates in NetscapePlugin.

https://bugs.webkit.org/show_bug.cgi?id=144490

Patch by Sungmann Cho <sungmann.cho@navercorp.com> 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:

Source/WebKit2/ChangeLog

@@ -1,3 +1,20 @@
+2015-05-07  Sungmann Cho  <sungmann.cho@navercorp.com>
+
+        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  <adachan@apple.com>
 
         Fix a couple of cases where the backForwardListState's currentIndex is not set correctly in WebBackForwardList::backForwardListState().

Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -759,8 +759,10 @@ void NetscapePlugin::geometryDidChange(const IntSize& pluginSize, const IntRect&
     m_clipRect = clipRect;
     m_pluginToRootViewTransform = pluginToRootViewTransform;
 
+#if PLUGIN_ARCHITECTURE(X11)
     IntPoint frameRectLocationInWindowCoordinates = m_pluginToRootViewTransform.mapPoint(IntPoint());
     m_frameRectInWindowCoordinates = IntRect(frameRectLocationInWindowCoordinates, m_pluginSize);
+#endif
 
     platformGeometryDidChange();
 

Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -291,8 +291,9 @@ class NetscapePlugin : public Plugin {
     // 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;