[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:23:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f8d270950b6c1ab4d052ced27dab05956c739dcb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 15:37:48 2010 +0000
2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Some viewport meta tag api refactoring
https://bugs.webkit.org/show_bug.cgi?id=47334
WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
* dom/ViewportArguments.cpp:
(WebCore::computeViewportAttributes):
* dom/ViewportArguments.h:
2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Some viewport meta tag api refactoring
https://bugs.webkit.org/show_bug.cgi?id=47334
WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
* Api/qwebpage.cpp:
(QWebPage::viewportConfigurationForSize):
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::viewportAsText):
2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Some viewport meta tag api refactoring
https://bugs.webkit.org/show_bug.cgi?id=47334
WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::viewportConfigurationForSize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69312 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 01c0e02..40ab18b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Some viewport meta tag api refactoring
+ https://bugs.webkit.org/show_bug.cgi?id=47334
+
+ WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
+ WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::computeViewportAttributes):
+ * dom/ViewportArguments.h:
+
2010-10-07 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp
index 695628c..74ff19d 100644
--- a/WebCore/dom/ViewportArguments.cpp
+++ b/WebCore/dom/ViewportArguments.cpp
@@ -41,7 +41,7 @@ using namespace std;
namespace WebCore {
-ViewportAttributes findConfigurationForViewportData(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
+ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
{
ViewportAttributes result;
@@ -151,8 +151,8 @@ ViewportAttributes findConfigurationForViewportData(ViewportArguments args, int
// Extend width and height to fill the visual viewport for the resolved initial-scale.
width = max(width, availableWidth / result.initialScale);
height = max(height, availableHeight / result.initialScale);
- result.layoutViewport.setWidth(width);
- result.layoutViewport.setHeight(height);
+ result.layoutSize.setWidth(width);
+ result.layoutSize.setHeight(height);
// Update minimum scale factor, to never allow zooming out more than viewport
result.minimumScale = max(result.minimumScale, max(availableWidth / width, availableHeight / height));
diff --git a/WebCore/dom/ViewportArguments.h b/WebCore/dom/ViewportArguments.h
index 89af290..de1745b 100644
--- a/WebCore/dom/ViewportArguments.h
+++ b/WebCore/dom/ViewportArguments.h
@@ -43,7 +43,7 @@ enum ViewportErrorCode {
};
struct ViewportAttributes {
- IntSize layoutViewport;
+ IntSize layoutSize;
float devicePixelRatio;
@@ -97,7 +97,7 @@ struct ViewportArguments {
}
};
-ViewportAttributes findConfigurationForViewportData(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
+ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement);
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index a089362..b63d257 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2250,10 +2250,10 @@ QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSi
deviceHeight = size.height();
}
- WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
+ WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
result.m_isValid = true;
- result.m_size = conf.layoutViewport;
+ result.m_size = conf.layoutSize;
result.m_initialScaleFactor = conf.initialScale;
result.m_minimumScaleFactor = conf.minimumScale;
result.m_maximumScaleFactor = conf.maximumScale;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 855d0b2..b935863 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Some viewport meta tag api refactoring
+ https://bugs.webkit.org/show_bug.cgi?id=47334
+
+ WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
+ WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::viewportConfigurationForSize):
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::viewportAsText):
+
2010-10-07 Keith Kyzivat <keith.kyzivat at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 0b54fba..28f6810 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -632,7 +632,7 @@ void DumpRenderTreeSupportQt::dumpNotification(bool b)
QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, const QSize& availableSize)
{
WebCore::ViewportArguments args = page->d->viewportArguments();
- WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(args,
+ WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(args,
/* desktop-width */ 980,
/* device-width */ 320,
/* device-height */ 480,
@@ -641,8 +641,8 @@ QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, const QSize& ava
QString res;
res = res.sprintf("viewport size %dx%d scale %f with limits [%f, %f]\n",
- conf.layoutViewport.width(),
- conf.layoutViewport.height(),
+ conf.layoutSize.width(),
+ conf.layoutSize.height(),
conf.initialScale,
conf.minimumScale,
conf.maximumScale);
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 156000a..64e5ecb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Some viewport meta tag api refactoring
+ https://bugs.webkit.org/show_bug.cgi?id=47334
+
+ WebCore::findConfigurationForViewportData renamed to computeViewportAttributes.
+ WebCore::ViewportAttributes::layoutViewport renamed to layoutSize.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::viewportConfigurationForSize):
+
2010-10-06 Jessie Berlin <jberlin at apple.com>
Reviewed by John Sullivan.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 15f4f6e..1595c63 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -339,12 +339,12 @@ QWKPage::ViewportConfiguration QWKPage::viewportConfigurationForSize(QSize avail
ViewportArguments args;
- WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(args, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
+ WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(args, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
ViewportConfiguration result;
result.m_isValid = true;
- result.m_size = conf.layoutViewport;
+ result.m_size = conf.layoutSize;
result.m_initialScaleFactor = conf.initialScale;
result.m_minimumScaleFactor = conf.minimumScale;
result.m_maximumScaleFactor = conf.maximumScale;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list