- Revision
- 134765
- Author
- kenn...@webkit.org
- Date
- 2012-11-15 05:00:33 -0800 (Thu, 15 Nov 2012)
Log Message
Rename member vars in ViewportArgument to match css-device-adapt
https://bugs.webkit.org/show_bug.cgi?id=102355
Reviewed by Gyuyoung Kim.
Source/WebCore:
No behavior change, thus no new tests.
* dom/ViewportArguments.cpp:
(WebCore::ViewportArguments::resolve):
(WebCore::setViewportFeature):
* dom/ViewportArguments.h:
(WebCore::ViewportArguments::ViewportArguments):
(ViewportArguments):
(WebCore::ViewportArguments::operator==):
Source/WebKit/efl:
* ewk/ewk_view.cpp:
(_ewk_view_priv_new): Update to reflect name change.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134764 => 134765)
--- trunk/Source/WebCore/ChangeLog 2012-11-15 12:46:23 UTC (rev 134764)
+++ trunk/Source/WebCore/ChangeLog 2012-11-15 13:00:33 UTC (rev 134765)
@@ -1,3 +1,20 @@
+2012-11-15 Kenneth Rohde Christiansen <kenn...@webkit.org>
+
+ Rename member vars in ViewportArgument to match css-device-adapt
+ https://bugs.webkit.org/show_bug.cgi?id=102355
+
+ Reviewed by Gyuyoung Kim.
+
+ No behavior change, thus no new tests.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::ViewportArguments::resolve):
+ (WebCore::setViewportFeature):
+ * dom/ViewportArguments.h:
+ (WebCore::ViewportArguments::ViewportArguments):
+ (ViewportArguments):
+ (WebCore::ViewportArguments::operator==):
+
2012-11-15 Andrey Adaikin <aand...@chromium.org>
Web Inspector: [WebGL] cloneNode for images with revoked Blob URIs fails
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (134764 => 134765)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-11-15 12:46:23 UTC (rev 134764)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-11-15 13:00:33 UTC (rev 134765)
@@ -69,10 +69,10 @@
{
float resultWidth = width;
float resultHeight = height;
- float resultZoom = initialScale;
- float resultMinZoom = minimumScale;
- float resultMaxZoom = maximumScale;
- float resultUserZoom = userScalable;
+ float resultZoom = zoom;
+ float resultMinZoom = minZoom;
+ float resultMaxZoom = maxZoom;
+ float resultUserZoom = userZoom;
bool resultAutoFit = resultZoom == ViewportArguments::ValueAuto;
@@ -299,13 +299,13 @@
else if (keyString == "height")
arguments->height = findSizeValue(keyString, valueString, document);
else if (keyString == "initial-scale")
- arguments->initialScale = findScaleValue(keyString, valueString, document);
+ arguments->zoom = findScaleValue(keyString, valueString, document);
else if (keyString == "minimum-scale")
- arguments->minimumScale = findScaleValue(keyString, valueString, document);
+ arguments->minZoom = findScaleValue(keyString, valueString, document);
else if (keyString == "maximum-scale")
- arguments->maximumScale = findScaleValue(keyString, valueString, document);
+ arguments->maxZoom = findScaleValue(keyString, valueString, document);
else if (keyString == "user-scalable")
- arguments->userScalable = findUserScalableValue(keyString, valueString, document);
+ arguments->userZoom = findUserScalableValue(keyString, valueString, document);
else if (keyString == "target-densitydpi")
reportViewportWarning(document, TargetDensityDpiUnsupported, String(), String());
else
Modified: trunk/Source/WebCore/dom/ViewportArguments.h (134764 => 134765)
--- trunk/Source/WebCore/dom/ViewportArguments.h 2012-11-15 12:46:23 UTC (rev 134764)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2012-11-15 13:00:33 UTC (rev 134765)
@@ -74,35 +74,35 @@
ViewportArguments(Type type = Implicit)
: type(type)
- , initialScale(ValueAuto)
- , minimumScale(ValueAuto)
- , maximumScale(ValueAuto)
, width(ValueAuto)
, height(ValueAuto)
- , userScalable(ValueAuto)
+ , zoom(ValueAuto)
+ , minZoom(ValueAuto)
+ , maxZoom(ValueAuto)
+ , userZoom(ValueAuto)
{
}
// All arguments are in CSS units.
ViewportAttributes resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const;
- float initialScale;
- float minimumScale;
- float maximumScale;
float width;
float height;
- float userScalable;
+ float zoom;
+ float minZoom;
+ float maxZoom;
+ float userZoom;
bool operator==(const ViewportArguments& other) const
{
// Used for figuring out whether to reset the viewport or not,
// thus we are not taking type into account.
- return initialScale == other.initialScale
- && minimumScale == other.minimumScale
- && maximumScale == other.maximumScale
- && width == other.width
+ return width == other.width
&& height == other.height
- && userScalable == other.userScalable;
+ && zoom == other.zoom
+ && minZoom == other.minZoom
+ && maxZoom == other.maxZoom
+ && userZoom == other.userZoom;
}
bool operator!=(const ViewportArguments& other) const
Modified: trunk/Source/WebKit/efl/ChangeLog (134764 => 134765)
--- trunk/Source/WebKit/efl/ChangeLog 2012-11-15 12:46:23 UTC (rev 134764)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-11-15 13:00:33 UTC (rev 134765)
@@ -1,3 +1,13 @@
+2012-11-15 Kenneth Rohde Christiansen <kenn...@webkit.org>
+
+ Rename member vars in ViewportArgument to match css-device-adapt
+ https://bugs.webkit.org/show_bug.cgi?id=102355
+
+ Reviewed by Gyuyoung Kim.
+
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new): Update to reflect name change.
+
2012-11-15 Gyuyoung Kim <gyuyoung....@samsung.com>
Unreviewed. Fix build break when using --no-tiled-backing-store option.
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (134764 => 134765)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-15 12:46:23 UTC (rev 134764)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-15 13:00:33 UTC (rev 134765)
@@ -804,12 +804,13 @@
WebCore::LayoutMilestones layoutMilestones = WebCore::DidFirstLayout | WebCore::DidFirstVisuallyNonEmptyLayout;
priv->page->addLayoutMilestones(layoutMilestones);
+ // FIXME: Noone is supposed to do this manually.
priv->viewportArguments.width = WebCore::ViewportArguments::ValueAuto;
priv->viewportArguments.height = WebCore::ViewportArguments::ValueAuto;
- priv->viewportArguments.initialScale = WebCore::ViewportArguments::ValueAuto;
- priv->viewportArguments.minimumScale = WebCore::ViewportArguments::ValueAuto;
- priv->viewportArguments.maximumScale = WebCore::ViewportArguments::ValueAuto;
- priv->viewportArguments.userScalable = true;
+ priv->viewportArguments.zoom = WebCore::ViewportArguments::ValueAuto;
+ priv->viewportArguments.minZoom = WebCore::ViewportArguments::ValueAuto;
+ priv->viewportArguments.maxZoom = WebCore::ViewportArguments::ValueAuto;
+ priv->viewportArguments.userZoom = true;
priv->pageSettings->setLoadsImagesAutomatically(true);
priv->pageSettings->setDefaultTextEncodingName("iso-8859-1");
