Unreviewed, fix the iOS build after r231779
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2018 03:00:27 +0000 (03:00 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2018 03:00:27 +0000 (03:00 +0000)
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

Source/WebCore/ChangeLog
Source/WebCore/page/DisabledAdaptations.cpp

index f883c04..81d9fda 100644 (file)
@@ -1,3 +1,12 @@
+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-14  Zalan Bujtas  <zalan@apple.com>
 
         [LFC] FormattingContext:computeOutOfFlowNonReplacedHeight/Width should use the computed margins/paddings/borders
index b2e35b7..312ee3f 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace WebCore {
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DisabledAdaptationsAdditions.cpp>)
 
 #import <WebKitAdditions/DisabledAdaptationsAdditions.cpp>
 
@@ -38,7 +38,7 @@ namespace WebCore {
 
 String extraZoomModeAdaptationName()
 {
-    return emptyString();
+    return ASCIILiteral("extrazoom");
 }
 
 #endif