Title: [231885] branches/safari-606.1.17-branch/Source/WebCore
- Revision
- 231885
- Author
- bshaf...@apple.com
- Date
- 2018-05-16 20:58:09 -0700 (Wed, 16 May 2018)
Log 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
Modified Paths
Diff
Modified: branches/safari-606.1.17-branch/Source/WebCore/ChangeLog (231884 => 231885)
--- branches/safari-606.1.17-branch/Source/WebCore/ChangeLog 2018-05-17 03:53:14 UTC (rev 231884)
+++ branches/safari-606.1.17-branch/Source/WebCore/ChangeLog 2018-05-17 03:58:09 UTC (rev 231885)
@@ -1,5 +1,27 @@
2018-05-16 Babak Shafiei <bshaf...@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_hs...@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 <bshaf...@apple.com>
+
Cherry-pick r231779. rdar://problem/39999778
[Extra zoom mode] Google search results are excessively zoomed in
Modified: branches/safari-606.1.17-branch/Source/WebCore/page/DisabledAdaptations.cpp (231884 => 231885)
--- branches/safari-606.1.17-branch/Source/WebCore/page/DisabledAdaptations.cpp 2018-05-17 03:53:14 UTC (rev 231884)
+++ branches/safari-606.1.17-branch/Source/WebCore/page/DisabledAdaptations.cpp 2018-05-17 03:58:09 UTC (rev 231885)
@@ -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 @@
String extraZoomModeAdaptationName()
{
- return emptyString();
+ return ASCIILiteral("extrazoom");
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
