[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 ef189c6b2844763d8021065fb73a6f7c093f5530
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 00:08:28 2011 +0000

    2011-01-12  Chris Marrin  <cmarrin at apple.com>
    
            Unreviewed.
    
            Fix for Gtk and Windows builds
    
            * page/Frame.cpp:
            (WebCore::Frame::scalePage):
            * page/Frame.h:
            * platform/graphics/ca/win/PlatformCALayerWin.cpp:
            (PlatformCALayer::contentsScale):
            (PlatformCALayer::setContentsScale):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 01e404c..df42939 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-12  Chris Marrin  <cmarrin at apple.com>
 
+        Unreviewed.
+
+        Fix for Gtk and Windows builds
+
+        * page/Frame.cpp:
+        (WebCore::Frame::scalePage):
+        * page/Frame.h:
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayer::contentsScale):
+        (PlatformCALayer::setContentsScale):
+
+2011-01-12  Chris Marrin  <cmarrin at apple.com>
+
         UNreviewed.
 
         Fix for the Windows build
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
index afff62e..545fb99 100644
--- a/Source/WebCore/page/Frame.cpp
+++ b/Source/WebCore/page/Frame.cpp
@@ -975,6 +975,7 @@ void Frame::setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor
     }
 }
 
+#if USE(ACCELERATED_COMPOSITING)
 void Frame::updateContentsScale(float scale)
 {
     for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
@@ -984,6 +985,7 @@ void Frame::updateContentsScale(float scale)
     if (root && root->compositor())
         root->compositor()->updateContentsScale(scale);
 }
+#endif
 
 void Frame::scalePage(float scale, const IntPoint& origin)
 {
@@ -998,7 +1000,9 @@ void Frame::scalePage(float scale, const IntPoint& origin)
 
     document->recalcStyle(Node::Force);
 
+#if USE(ACCELERATED_COMPOSITING)
     updateContentsScale(scale);
+#endif
 
     if (FrameView* view = this->view()) {
         if (document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
diff --git a/Source/WebCore/page/Frame.h b/Source/WebCore/page/Frame.h
index 540c1a8..a1e5c10 100644
--- a/Source/WebCore/page/Frame.h
+++ b/Source/WebCore/page/Frame.h
@@ -208,7 +208,9 @@ namespace WebCore {
         void injectUserScriptsForWorld(DOMWrapperWorld*, const UserScriptVector&, UserScriptInjectionTime);
         void lifeSupportTimerFired(Timer<Frame>*);
 
+#if USE(ACCELERATED_COMPOSITING)
         void updateContentsScale(float);
+#endif
 
         HashSet<FrameDestructionObserver*> m_destructionObservers;
 
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
index 632d817..5e24cda 100644
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
@@ -586,12 +586,12 @@ void PlatformCALayer::setTimeOffset(CFTimeInterval value)
     setNeedsCommit();
 }
 
-float contentsScale() const
+float PlatformCALayer::contentsScale() const
 {
     return 1;
 }
 
-void setContentsScale(float)
+void PlatformCALayer::setContentsScale(float)
 {
 }
 

-- 
WebKit Debian packaging