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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4ce70b6dce6090ee51c84e408815525c378a5083
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 18 10:04:02 2010 +0000

    REGRESSION (r67762): Over 160 layout tests failing due to incorrect zoom factors in subframes
    https://bugs.webkit.org/show_bug.cgi?id=46031
    
    Reviewed by Eric Seidel.
    
    * page/Frame.cpp:
    (WebCore::parentPageZoomFactor): Return the zoom factor of the parent frame.
    (WebCore::parentTextZoomFactor): Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4104e5a..56db6fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-18  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r67762): Over 160 layout tests failing due to incorrect zoom factors in subframes
+        https://bugs.webkit.org/show_bug.cgi?id=46031
+
+        * page/Frame.cpp:
+        (WebCore::parentPageZoomFactor): Return the zoom factor of the parent frame.
+        (WebCore::parentTextZoomFactor): Ditto.
+
 2010-09-17  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 3e68c52..f6b2ce0 100755
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -134,7 +134,7 @@ static inline float parentPageZoomFactor(Frame* frame)
     Frame* parent = frame->tree()->parent();
     if (!parent)
         return 1;
-    return frame->pageZoomFactor();
+    return parent->pageZoomFactor();
 }
 
 static inline float parentTextZoomFactor(Frame* frame)
@@ -142,7 +142,7 @@ static inline float parentTextZoomFactor(Frame* frame)
     Frame* parent = frame->tree()->parent();
     if (!parent)
         return 1;
-    return frame->textZoomFactor();
+    return parent->textZoomFactor();
 }
 
 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)

-- 
WebKit Debian packaging