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

[dglazkov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1c930e38a36c9ea349521ed42a95ec6245773311
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 18 02:59:25 2010 +0000

    2010-09-17  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            Move calls from frameView->pageZoomFactor() to frame->pageZoomFactor().
    
            * page/EventHandler.cpp:
            (WebCore::EventHandler::handleTouchEvent): Removed a helper function,
                added direct calls to frame->pageZoomFactor().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0adc824..fbb2684 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-17  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        Move calls from frameView->pageZoomFactor() to frame->pageZoomFactor().
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleTouchEvent): Removed a helper function,
+            added direct calls to frame->pageZoomFactor().
+
 2010-09-17  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index e70df0b..5e834e2 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2800,12 +2800,6 @@ static PassRefPtr<TouchList> assembleTargetTouches(Touch* touchTarget, TouchList
     return targetTouches.release();
 }
 
-static float pageZoomFactor(Frame* frame)
-{
-    FrameView* view = frame->view();
-    return view ? view->pageZoomFactor() : 1.0f;
-}
-
 bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 {
     RefPtr<TouchList> touches = TouchList::create();
@@ -2862,8 +2856,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             pagePoint = documentPointForWindowPoint(doc->frame(), point.pos());
         }
 
-        int adjustedPageX = lroundf(pagePoint.x() / pageZoomFactor(m_frame));
-        int adjustedPageY = lroundf(pagePoint.y() / pageZoomFactor(m_frame));
+        int adjustedPageX = lroundf(pagePoint.x() / m_frame->pageZoomFactor());
+        int adjustedPageY = lroundf(pagePoint.y() / m_frame->pageZoomFactor());
 
         // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
         unsigned touchPointTargetKey = point.id() + 1;

-- 
WebKit Debian packaging