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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 31b1e5fce9d7f9d832bd266aaeab45985bac96d9
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 23:34:19 2010 +0000

    2010-07-14  Simon Fraser  <simon.fraser at apple.com>
    
            Fix non-ACCELERATED_COMPOSITING build.
    
            * WebView/WebRenderLayer.mm:
            (+[WebRenderLayer compositingInfoForLayer:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index dd34e58..119ce6d 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-14  Simon Fraser  <simon.fraser at apple.com>
 
+        Fix non-ACCELERATED_COMPOSITING build.
+
+        * WebView/WebRenderLayer.mm:
+        (+[WebRenderLayer compositingInfoForLayer:]):
+
+2010-07-14  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by John Sullivan.
 
         <rdar://problem/8186963> Expose information about compositing layers.
diff --git a/WebKit/mac/WebView/WebRenderLayer.mm b/WebKit/mac/WebView/WebRenderLayer.mm
index 444c672..e24a3c9 100644
--- a/WebKit/mac/WebView/WebRenderLayer.mm
+++ b/WebKit/mac/WebView/WebRenderLayer.mm
@@ -80,6 +80,7 @@ using namespace WebCore;
         return @"";
 
     NSString *layerType = @"";
+#if USE(ACCELERATED_COMPOSITING)
     RenderLayerBacking* backing = layer->backing();
     switch (backing->compositingLayerType()) {
         case NormalCompositingLayer:
@@ -101,6 +102,7 @@ using namespace WebCore;
 
     if (backing->hasAncestorClippingLayer())
         layerType = [layerType stringByAppendingString:@" (clipped)"];
+#endif
 
     return layerType;
 }

-- 
WebKit Debian packaging