Commit bcd26791 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

2011-01-18 Damian Kaleta <dkaleta@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
parent 987ad2e1
2011-01-18 Damian Kaleta <dkaleta@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@apple.com>
 
Reviewed by Dan Bernstein.
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment