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

[darin at apple.com]

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

    Build fix for platforms that compile Touch.
    
    * dom/Touch.cpp:
    (WebCore::contentsX):
    (WebCore::contentsY):
    Get zoom factor from Frame rather than FrameView.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 665bfb7..c34cf35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-17  Darin Adler  <darin at apple.com>
 
+        Build fix for platforms that compile Touch.
+
+        * dom/Touch.cpp:
+        (WebCore::contentsX):
+        (WebCore::contentsY):
+        Get zoom factor from Frame rather than FrameView.
+
+2010-09-17  Darin Adler  <darin at apple.com>
+
         Reviewed by Sam Weinig.
 
         REGRESSION (r60104): Zoom level is unexpectedly reset on page reload
diff --git a/WebCore/dom/Touch.cpp b/WebCore/dom/Touch.cpp
index 585d9d4..fbb3fed 100644
--- a/WebCore/dom/Touch.cpp
+++ b/WebCore/dom/Touch.cpp
@@ -40,7 +40,7 @@ static int contentsX(Frame* frame)
     FrameView* frameView = frame->view();
     if (!frameView)
         return 0;
-    return frameView->scrollX() / frameView->pageZoomFactor();
+    return frameView->scrollX() / frame->pageZoomFactor();
 }
 
 static int contentsY(Frame* frame)
@@ -50,11 +50,10 @@ static int contentsY(Frame* frame)
     FrameView* frameView = frame->view();
     if (!frameView)
         return 0;
-    return frameView->scrollY() / frameView->pageZoomFactor();
+    return frameView->scrollY() / frame->pageZoomFactor();
 }
 
-Touch::Touch(Frame* frame, EventTarget* target, unsigned identifier, 
-        int screenX, int screenY, int pageX, int pageY)
+Touch::Touch(Frame* frame, EventTarget* target, unsigned identifier, int screenX, int screenY, int pageX, int pageY)
     : m_target(target)
     , m_identifier(identifier)
     , m_clientX(pageX - contentsX(frame))
@@ -69,4 +68,3 @@ Touch::Touch(Frame* frame, EventTarget* target, unsigned identifier,
 } // namespace WebCore
 
 #endif
-

-- 
WebKit Debian packaging