[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:19:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5d8e3bf795930bea87194dcd269040bd249b672f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 17:34:24 2010 +0000
2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
https://bugs.webkit.org/show_bug.cgi?id=47268
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
* dom/ViewportArguments.cpp:
(WebCore::findConfigurationForViewportData):
* dom/ViewportArguments.h:
2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
https://bugs.webkit.org/show_bug.cgi?id=47268
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
* Api/qwebpage.cpp:
(QWebPage::viewportConfigurationForSize):
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::viewportAsText):
2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
https://bugs.webkit.org/show_bug.cgi?id=47268
Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::viewportConfigurationForSize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69211 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f0b99e0..5a19693 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+ https://bugs.webkit.org/show_bug.cgi?id=47268
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::findConfigurationForViewportData):
+ * dom/ViewportArguments.h:
+
2010-10-06 Renata Hodovan <reni at inf.u-szeged.hu>
Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp
index 356f9ed..695628c 100644
--- a/WebCore/dom/ViewportArguments.cpp
+++ b/WebCore/dom/ViewportArguments.cpp
@@ -41,9 +41,9 @@ using namespace std;
namespace WebCore {
-ViewportConfiguration findConfigurationForViewportData(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
+ViewportAttributes findConfigurationForViewportData(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport)
{
- ViewportConfiguration result;
+ ViewportAttributes result;
float availableWidth = visibleViewport.width();
float availableHeight = visibleViewport.height();
diff --git a/WebCore/dom/ViewportArguments.h b/WebCore/dom/ViewportArguments.h
index 32c9454..89af290 100644
--- a/WebCore/dom/ViewportArguments.h
+++ b/WebCore/dom/ViewportArguments.h
@@ -42,7 +42,7 @@ enum ViewportErrorCode {
TargetDensityDpiTooSmallOrLargeError
};
-struct ViewportConfiguration {
+struct ViewportAttributes {
IntSize layoutViewport;
float devicePixelRatio;
@@ -97,7 +97,7 @@ struct ViewportArguments {
}
};
-ViewportConfiguration findConfigurationForViewportData(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, int deviceDPI, IntSize visibleViewport);
+ViewportAttributes findConfigurationForViewportData(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 9ded37b..ec2fff9 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2391,7 +2391,7 @@ QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSi
deviceHeight = size.height();
}
- WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
+ WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
result.m_isValid = true;
result.m_size = conf.layoutViewport;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 006fbdb..edb449f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+ https://bugs.webkit.org/show_bug.cgi?id=47268
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+
+ * Api/qwebpage.cpp:
+ (QWebPage::viewportConfigurationForSize):
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::viewportAsText):
+
2010-10-05 Andrew Wilson <atwilson at chromium.org>
Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 550598b..0b54fba 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::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(args,
+ WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(args,
/* desktop-width */ 980,
/* device-width */ 320,
/* device-height */ 480,
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 19ab2ac..477b259 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-06 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+ https://bugs.webkit.org/show_bug.cgi?id=47268
+
+ Renaming WebCore::ViewportConfiguration to WebCore::ViewportAttributes
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::viewportConfigurationForSize):
+
2010-10-06 Sam Weinig <sam at webkit.org>
Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 6188266..0f10f13 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -339,7 +339,7 @@ QWKPage::ViewportConfiguration QWKPage::viewportConfigurationForSize(QSize avail
ViewportArguments args;
- WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(args, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
+ WebCore::ViewportAttributes conf = WebCore::findConfigurationForViewportData(args, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
ViewportConfiguration result;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list