[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit bcd2679133cd13f1e573c39a7fa83c78df57ef75
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 22:30:25 2011 +0000

    2011-01-18  Damian Kaleta  <dkaleta at apple.com>
    
            Reviewed by Sam Weinig.
    
            WK2 methods WKPageScaleWebView and WKPageGetViewScaleFactor need to have consistent names
            https://bugs.webkit.org/show_bug.cgi?id=52647
    
            * UIProcess/API/C/WKPage.cpp:
            (WKPageSetScaleFactor):
            (WKPageGetScaleFactor):
            * UIProcess/API/C/WKPage.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f879c44..76a063b 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18  Damian Kaleta  <dkaleta at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WK2 methods WKPageScaleWebView and WKPageGetViewScaleFactor need to have consistent names
+        https://bugs.webkit.org/show_bug.cgi?id=52647
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetScaleFactor):
+        (WKPageGetScaleFactor):
+        * UIProcess/API/C/WKPage.h:
+
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
index edcbf87..82daa4b 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -260,11 +260,16 @@ void WKPageSetPageAndTextZoomFactors(WKPageRef pageRef, double pageZoomFactor, d
     toImpl(pageRef)->setPageAndTextZoomFactors(pageZoomFactor, textZoomFactor);
 }
 
-void WKPageScaleWebView(WKPageRef pageRef, double scale, WKPoint origin)
+void WKPageSetScaleFactor(WKPageRef pageRef, double scale, WKPoint origin)
 {
     toImpl(pageRef)->scaleWebView(scale, toIntPoint(origin));
 }
 
+double WKPageGetScaleFactor(WKPageRef pageRef)
+{
+    return toImpl(pageRef)->viewScaleFactor();
+}
+
 void WKPageSetUseFixedLayout(WKPageRef pageRef, bool fixed)
 {
     toImpl(pageRef)->setUseFixedLayout(fixed);
@@ -285,11 +290,6 @@ WKSize WKPageFixedLayoutSize(WKPageRef pageRef)
     return toAPI(toImpl(pageRef)->fixedLayoutSize());
 }
 
-double WKPageGetViewScaleFactor(WKPageRef pageRef)
-{
-    return toImpl(pageRef)->viewScaleFactor();
-}
-
 void WKPageFindString(WKPageRef pageRef, WKStringRef string, WKFindOptions options, unsigned maxMatchCount)
 {
     toImpl(pageRef)->findString(toImpl(string)->string(), toFindOptions(options), maxMatchCount);
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.h b/Source/WebKit2/UIProcess/API/C/WKPage.h
index 05730e5..615eecc 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.h
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.h
@@ -304,8 +304,8 @@ WK_EXPORT double WKPageGetPageZoomFactor(WKPageRef page);
 WK_EXPORT void WKPageSetPageZoomFactor(WKPageRef page, double zoomFactor);
 WK_EXPORT void WKPageSetPageAndTextZoomFactors(WKPageRef page, double pageZoomFactor, double textZoomFactor);
 
-WK_EXPORT void WKPageScaleWebView(WKPageRef page, double scale, WKPoint origin);
-WK_EXPORT double WKPageGetViewScaleFactor(WKPageRef page);
+WK_EXPORT void WKPageSetScaleFactor(WKPageRef page, double scale, WKPoint origin);
+WK_EXPORT double WKPageGetScaleFactor(WKPageRef page);
 
 WK_EXPORT void WKPageSetUseFixedLayout(WKPageRef page, bool fixed);
 WK_EXPORT void WKPageSetFixedLayoutSize(WKPageRef page, WKSize size);

-- 
WebKit Debian packaging