Index: Source/core/dom/ViewportDescription.h |
diff --git a/Source/core/dom/ViewportDescription.h b/Source/core/dom/ViewportDescription.h |
index 1e2ec6892127b928d7cd216ba5a9d8678647e545..f96661a2da159ed1332a4d7cdb99f42eca2af3d8 100644 |
--- a/Source/core/dom/ViewportDescription.h |
+++ b/Source/core/dom/ViewportDescription.h |
@@ -66,7 +66,10 @@ struct ViewportDescription { |
, userZoom(true) |
, orientation(ValueAuto) |
, deprecatedTargetDensityDPI(ValueAuto) |
- , minimalUI(false) |
+ , zoomIsExplicit(false) |
+ , minZoomIsExplicit(false) |
+ , maxZoomIsExplicit(false) |
+ , userZoomIsExplicit(false) |
{ |
} |
@@ -83,7 +86,13 @@ struct ViewportDescription { |
bool userZoom; |
float orientation; |
float deprecatedTargetDensityDPI; // Only used for Android WebView |
- bool minimalUI; |
+ |
+ // Whether the computed value was explicitly specified rather than being |
+ // inferred. |
+ bool zoomIsExplicit; |
+ bool minZoomIsExplicit; |
+ bool maxZoomIsExplicit; |
+ bool userZoomIsExplicit; |
bool operator==(const ViewportDescription& other) const |
{ |
@@ -99,7 +108,10 @@ struct ViewportDescription { |
&& userZoom == other.userZoom |
&& orientation == other.orientation |
&& deprecatedTargetDensityDPI == other.deprecatedTargetDensityDPI |
- && minimalUI == other.minimalUI; |
+ && zoomIsExplicit == other.zoomIsExplicit |
+ && minZoomIsExplicit == other.minZoomIsExplicit |
+ && maxZoomIsExplicit == other.maxZoomIsExplicit |
+ && userZoomIsExplicit == other.userZoomIsExplicit; |
} |
bool operator!=(const ViewportDescription& other) const |