[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[enrica at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d6d7e351478de938b3302e89af330a14bd821eb4
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 01:56:01 2010 +0000

    Fixed broken build on Windows.
    Added contditional compilation for accelerated compositing.
    
    * WebView.cpp:
    (WebView::deleteBackingStore):
    (WebView::addToDirtyRegion):
    (WebView::updateBackingStore):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index d29186a..a04b5e7 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-12  Enrica Casucci  <enrica at apple.com>
+
+        Fixed broken build on Windows.
+        Added contditional compilation for accelerated compositing.
+
+        * WebView.cpp:
+        (WebView::deleteBackingStore):
+        (WebView::addToDirtyRegion):
+        (WebView::updateBackingStore):
+
 2010-03-12  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 48d7d4e..1be58de 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -736,8 +736,10 @@ void WebView::deleteBackingStore()
     }
     m_backingStoreBitmap.clear();
     m_backingStoreDirtyRegion.clear();
+#if USE(ACCELERATED_COMPOSITING)
     if (m_layerRenderer)
         m_layerRenderer->setBackingStoreDirty(false);
+#endif
 
     m_backingStoreSize.cx = m_backingStoreSize.cy = 0;
 }
@@ -786,8 +788,10 @@ void WebView::addToDirtyRegion(HRGN newRegion)
     } else
         m_backingStoreDirtyRegion.set(newRegion);
 
+#if USE(ACCELERATED_COMPOSITING)
     if (m_layerRenderer)
         m_layerRenderer->setBackingStoreDirty(true);
+#endif
 
     if (m_uiDelegatePrivate)
         m_uiDelegatePrivate->webViewDidInvalidate(this);
@@ -915,8 +919,10 @@ void WebView::updateBackingStore(FrameView* frameView, HDC dc, bool backingStore
             m_uiDelegatePrivate->webViewPainted(this);
 
         m_backingStoreDirtyRegion.clear();
+#if USE(ACCELERATED_COMPOSITING)
         if (m_layerRenderer)
             m_layerRenderer->setBackingStoreDirty(false);
+#endif
     }
 
     if (!dc) {

-- 
WebKit Debian packaging