[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 d0a9dc7abb68c03186d53b21ee2a8b75f033cf86
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 23:52:46 2011 +0000

    2011-01-12  Chris Marrin  <cmarrin at apple.com>
    
            UNreviewed.
    
            Fix for the Windows build
    
            * platform/graphics/ca/win/PlatformCALayerWin.cpp:
            (contentsScale):
            (setContentsScale):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4b38dcf..01e404c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-12  Chris Marrin  <cmarrin at apple.com>
 
+        UNreviewed.
+
+        Fix for the Windows build
+
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (contentsScale):
+        (setContentsScale):
+
+2011-01-12  Chris Marrin  <cmarrin at apple.com>
+
         Unreviewed.
 
         Another build fix
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
index 919c3b3..632d817 100644
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
@@ -586,6 +586,15 @@ void PlatformCALayer::setTimeOffset(CFTimeInterval value)
     setNeedsCommit();
 }
 
+float contentsScale() const
+{
+    return 1;
+}
+
+void setContentsScale(float)
+{
+}
+
 #ifndef NDEBUG
 static void printIndent(int indent)
 {

-- 
WebKit Debian packaging