Title: [139380] trunk/Source/WebKit2
- Revision
- 139380
- Author
- [email protected]
- Date
- 2013-01-10 15:35:54 -0800 (Thu, 10 Jan 2013)
Log Message
[Qt][EFL] Rename from xxxContentsScale() to xxxScale() in PageViewportController.
https://bugs.webkit.org/show_bug.cgi?id=106537
Patch by Huang Dongsung <[email protected]> on 2013-01-10
Reviewed by Kenneth Rohde Christiansen.
Rename 3 methods to match the terms of ViewportAttributes.
* UIProcess/API/qt/qwebkittest.cpp:
(QWebKitTest::viewport):
(QWebKitTest::contentsScale):
* UIProcess/PageViewportController.h:
(WebKit::PageViewportController::minimumScale):
(WebKit::PageViewportController::maximumScale):
(WebKit::PageViewportController::currentScale):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139379 => 139380)
--- trunk/Source/WebKit2/ChangeLog 2013-01-10 23:28:14 UTC (rev 139379)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-10 23:35:54 UTC (rev 139380)
@@ -1,3 +1,22 @@
+2013-01-10 Huang Dongsung <[email protected]>
+
+ [Qt][EFL] Rename from xxxContentsScale() to xxxScale() in PageViewportController.
+ https://bugs.webkit.org/show_bug.cgi?id=106537
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Rename 3 methods to match the terms of ViewportAttributes.
+
+ * UIProcess/API/qt/qwebkittest.cpp:
+ (QWebKitTest::viewport):
+ (QWebKitTest::contentsScale):
+ * UIProcess/PageViewportController.h:
+ (WebKit::PageViewportController::minimumScale):
+ (WebKit::PageViewportController::maximumScale):
+ (WebKit::PageViewportController::currentScale):
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ (WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
+
2013-01-10 Michael Pruett <[email protected]>
[WK2] Set IndexedDB database path in WK2
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (139379 => 139380)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2013-01-10 23:28:14 UTC (rev 139379)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2013-01-10 23:35:54 UTC (rev 139380)
@@ -151,8 +151,8 @@
if (const PageViewportController* const viewportHandler = m_webViewPrivate->viewportController()) {
viewportData.insert(QLatin1String("layoutSize"), toJsonObject(viewportHandler->contentsLayoutSize()));
viewportData.insert(QLatin1String("isScalable"), viewportHandler->allowsUserScaling());
- viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumContentsScale());
- viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumContentsScale());
+ viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumScale());
+ viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumScale());
} else {
viewportData.insert(QLatin1String("initialScale"), 1.0);
viewportData.insert(QLatin1String("layoutSize"), toJsonObject(QSizeF()));
@@ -173,6 +173,6 @@
QVariant QWebKitTest::contentsScale() const
{
if (const PageViewportController* const viewport = m_webViewPrivate->viewportController())
- return viewport->currentContentsScale();
+ return viewport->currentScale();
return 1.0;
}
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (139379 => 139380)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.h 2013-01-10 23:28:14 UTC (rev 139379)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.h 2013-01-10 23:35:54 UTC (rev 139380)
@@ -66,9 +66,9 @@
WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
float deviceScaleFactor() const;
- float minimumContentsScale() const { return m_minimumScaleToFit; }
- float maximumContentsScale() const { return m_rawAttributes.maximumScale; }
- float currentContentsScale() const { return m_pageScaleFactor; }
+ float minimumScale() const { return m_minimumScaleToFit; }
+ float maximumScale() const { return m_rawAttributes.maximumScale; }
+ float currentScale() const { return m_pageScaleFactor; }
void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (139379 => 139380)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-01-10 23:28:14 UTC (rev 139379)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-01-10 23:35:54 UTC (rev 139380)
@@ -268,7 +268,7 @@
break;
case ZoomBack: {
if (m_scaleStack.isEmpty()) {
- targetScale = m_controller->minimumContentsScale();
+ targetScale = m_controller->minimumScale();
endPosition.setY(hotspot.y() - viewportHotspot.y() / targetScale);
endPosition.setX(0);
m_zoomOutScale = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
