Changeset 71000 in webkit

Timestamp:

Oct 31, 2010 6:39:35 PM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2010-10-31 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Andreas Kling.

[Texmap] [Qt] Texture mapper initial implementation
​https://bugs.webkit.org/show_bug.cgi?id=47070

Build fix for X11.

No new tests; build fix.

• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::invalidateRect): (WebCore::PluginView::platformStart):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-31  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Texmap] [Qt] Texture mapper initial implementation
+        https://bugs.webkit.org/show_bug.cgi?id=47070
+
+        Build fix for X11.
+
+        No new tests; build fix.
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::invalidateRect):
+        (WebCore::PluginView::platformStart):
+
 2010-10-31  Andreas Kling  <kling@webkit.org>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -785 +785 @@
 void PluginView::invalidateRect(const IntRect& rect)
 {
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
     if (m_platformLayer) {
         m_platformLayer->update(QRectF(rect));
@@ -919 +919 @@
         m_pluginDisplay = getPluginDisplay();
 
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
         if (m_parentFrame->page()->chrome()->client()->allowsAcceleratedCompositing()
             && m_parentFrame->page()->settings()