[iOS] Upstream remainder of minimal-ui viewport changes

https://bugs.webkit.org/show_bug.cgi?id=126410

Reviewed by Sam Weinig.

Source/WebCore:

* dom/ViewportArguments.h:

Source/WebKit/ios:

* WebCoreSupport/WebChromeClientIOS.mm:
(dictionaryForViewportArguments):
* WebKit.iOS.exp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6e05efd..38f7dc5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-02  Andy Estes  <aestes@apple.com>
+
+        [iOS] Upstream remainder of minimal-ui viewport changes
+        https://bugs.webkit.org/show_bug.cgi?id=126410
+
+        Reviewed by Sam Weinig.
+
+        * dom/ViewportArguments.h:
+
 2014-01-07  Victor Costan  <costan@gmail.com>
 
         createElementNS handles element name 'xmlns' correctly.

diff --git a/Source/WebCore/dom/ViewportArguments.h b/Source/WebCore/dom/ViewportArguments.h
index d749d48..1fc8194 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.h
+++ b/Source/WebCore/dom/ViewportArguments.h
@@ -51,9 +51,6 @@ struct ViewportAttributes {
 
     float userScalable;
     float orientation;
-#if PLATFORM(IOS)
-    bool minimalUI;
-#endif
 };
 
 struct ViewportArguments {
@@ -115,6 +112,9 @@ struct ViewportArguments {
     float maxZoom;
     float userZoom;
     float orientation;
+#if PLATFORM(IOS)
+    bool minimalUI;
+#endif
 
     bool operator==(const ViewportArguments& other) const
     {

diff --git a/Source/WebKit/ios/ChangeLog b/Source/WebKit/ios/ChangeLog
index ab2e722..5f3aab4 100644 (file)
--- a/Source/WebKit/ios/ChangeLog
+++ b/Source/WebKit/ios/ChangeLog
@@ -1,3 +1,14 @@
+2014-01-02  Andy Estes  <aestes@apple.com>
+
+        [iOS] Upstream remainder of minimal-ui viewport changes
+        https://bugs.webkit.org/show_bug.cgi?id=126410
+
+        Reviewed by Sam Weinig.
+
+        * WebCoreSupport/WebChromeClientIOS.mm:
+        (dictionaryForViewportArguments):
+        * WebKit.iOS.exp:
+
 2013-12-31  Andy Estes  <aestes@apple.com>
 
         [iOS] Upstream PLATFORM(IOS) changes to Source/WebKit/

diff --git a/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm b/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm
index 7755331..bae46d3 100644 (file)
--- a/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm
+++ b/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm
@@ -162,7 +162,8 @@ static inline NSDictionary* dictionaryForViewportArguments(const WebCore::Viewpo
               @"maximum-scale":@(arguments.maxZoom),
               @"user-scalable":@(arguments.userZoom),
               @"width":@(arguments.width),
-              @"height":@(arguments.height) };
+              @"height":@(arguments.height),
+              @"minimal-ui":@(arguments.minimalUI) };
 }
 
 void WebChromeClientIOS::dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments& arguments) const

diff --git a/Source/WebKit/ios/WebKit.iOS.exp b/Source/WebKit/ios/WebKit.iOS.exp
index 92d51a8..0c89480 100644 (file)
--- a/Source/WebKit/ios/WebKit.iOS.exp
+++ b/Source/WebKit/ios/WebKit.iOS.exp
@@ -20,6 +20,7 @@ _WebQuickLookUTIKey
 _WebViewportHeightKey
 _WebViewportInitialScaleKey
 _WebViewportMaximumScaleKey
+_WebViewportMinimalUIKey
 _WebViewportMinimumScaleKey
 _WebViewportUserScalableKey
 _WebViewportWidthKey