Changeset 231885 in webkit

Timestamp:

May 16, 2018 8:58:09 PM (6 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r231784. rdar://problem/39999778

Unreviewed, fix the iOS build after r231779

Also address a minor in-person review comment by returning "extrazoom" instead of the empty string.

• page/DisabledAdaptations.cpp: (WebCore::extraZoomModeAdaptationName):

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

Location:

branches/safari-606.1.17-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DisabledAdaptations.cpp (modified) (2 diffs)

branches/safari-606.1.17-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-16  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r231784. rdar://problem/39999778
+
+    Unreviewed, fix the iOS build after r231779
+    
+    Also address a minor in-person review comment by returning "extrazoom" instead of the empty string.
+    
+    * page/DisabledAdaptations.cpp:
+    (WebCore::extraZoomModeAdaptationName):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-05-14  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Unreviewed, fix the iOS build after r231779
+
+            Also address a minor in-person review comment by returning "extrazoom" instead of the empty string.
+
+            * page/DisabledAdaptations.cpp:
+            (WebCore::extraZoomModeAdaptationName):
+
 2018-05-16  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-606.1.17-branch/Source/WebCore/page/DisabledAdaptations.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DisabledAdaptationsAdditions.cpp>)
 
 #import <WebKitAdditions/DisabledAdaptationsAdditions.cpp>
@@ -39 +39 @@
 String extraZoomModeAdaptationName()
 {
-    return emptyString();
+    return ASCIILiteral("extrazoom");
 }