[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[noam.rosenthal at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 22256dfc846aa7938183385288577f592d8f0afd
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 01:39:35 2010 +0000

    2010-10-31  No'am Rosenthal  <noam.rosenthal at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71000 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 522e337..8db8cdc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-31  No'am Rosenthal  <noam.rosenthal at 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 at webkit.org>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 9b4e595..fdbe552 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -784,7 +784,7 @@ bool PluginView::platformGetValue(NPNVariable variable, void* value, NPError* re
 
 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));
         return;
@@ -918,7 +918,7 @@ bool PluginView::platformStart()
         setPlatformWidget(0);
         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() 
             && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) {

-- 
WebKit Debian packaging