[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 4e17fef188bdd662000e54c5eb39b16a34af206e
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 23:12:57 2011 +0000

    2011-01-12  Chris Marrin  <cmarrin at apple.com>
    
            Unreviewed.
    
            Fix a build issue from http://trac.webkit.org/changeset/75639.
    
            * platform/graphics/GraphicsLayer.h:
            (WebCore::GraphicsLayer::contentsScale):
            (WebCore::GraphicsLayer::setContentsScale):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 305e645..bc2921b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-12  Chris Marrin  <cmarrin at apple.com>
 
+        Unreviewed.
+
+        Fix a build issue from http://trac.webkit.org/changeset/75639.
+
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::contentsScale):
+        (WebCore::GraphicsLayer::setContentsScale):
+
+2011-01-12  Chris Marrin  <cmarrin at apple.com>
+
         Reviewed by Kevin Decker.
 
         Pages with accelerated layers lose subpixel-AA and become blurry when a scale factor is applied
diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h
index f3ddea2..5fdf738 100644
--- a/Source/WebCore/platform/graphics/GraphicsLayer.h
+++ b/Source/WebCore/platform/graphics/GraphicsLayer.h
@@ -318,8 +318,8 @@ public:
     
     // Change the scale at which the contents are rendered. Note that contentsScale may not return
     // the same value passed to setContentsScale(), because of clamping and hysteresis.
-    virtual float contentsScale() const = 0;
-    virtual void setContentsScale(float) = 0;
+    virtual float contentsScale() const { return 1; }
+    virtual void setContentsScale(float) { }
 
     void dumpLayer(TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;
 

-- 
WebKit Debian packaging