Changeset 50670 in webkit

Timestamp:

Nov 9, 2009 11:26:20 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-09 Laszlo Gombos <Laszlo Gombos>

Reviewed by Jan Alonzo.

Make XP_UNIX tests consistent
​https://bugs.webkit.org/show_bug.cgi?id=31250

No new tests as there is no functional change.

• plugins/PluginView.cpp: (WebCore::PluginView::setFrameRect): Test if XP_UNIX is defined instead of the value of the macro

• plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::setNPWindowIfNeeded): Test if the XP_UNIX is defined instead of using the PLATFORM macro to be consistent (WebCore::PluginView::getValue): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.cpp (modified) (1 diff)
• plugins/gtk/PluginViewGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-09  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Jan Alonzo.
+
+        Make XP_UNIX tests consistent
+        https://bugs.webkit.org/show_bug.cgi?id=31250
+
+        No new tests as there is no functional change.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::setFrameRect): Test if XP_UNIX is defined
+        instead of the value of the macro
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::setNPWindowIfNeeded): Test if the XP_UNIX is
+        defined instead of using the PLATFORM macro to be consistent
+        (WebCore::PluginView::getValue): Ditto.
+
 2009-11-09  Kevin Watters  <kevinwatters@gmail.com>
 

trunk/WebCore/plugins/PluginView.cpp

@@ -128 +128 @@
     // On Windows and Symbian, always call plugin to change geometry.
     setNPWindowRect(rect);
-#elif XP_UNIX
+#elif defined(XP_UNIX)
     // On Unix, multiple calls to setNPWindow() in windowed mode causes Flash to crash
     if (m_mode == NP_FULL || !m_isWindowed)

trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -228 +228 @@
     GtkAllocation allocation = { m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height() };
     gtk_widget_size_allocate(platformPluginWidget(), &allocation);
-#if PLATFORM(XP_UNIX)
+#if defined(XP_UNIX)
     if (!m_needsXEmbed) {
         gtk_xtbin_set_position(GTK_XTBIN(platformPluginWidget()), m_windowRect.x(), m_windowRect.y());
@@ -333 +333 @@
 #endif
 
-#if PLATFORM(XP_UNIX)
+#if defined(XP_UNIX)
     case NPNVxtAppContext:
         if (!m_needsXEmbed) {