Title: [211327] tags/Safari-604.1.5.0.1/Source/WebCore
- Revision
- 211327
- Author
- bshaf...@apple.com
- Date
- 2017-01-27 23:03:05 -0800 (Fri, 27 Jan 2017)
Log Message
Merged r211324. rdar://problem/30247500
Modified Paths
Diff
Modified: tags/Safari-604.1.5.0.1/Source/WebCore/ChangeLog (211326 => 211327)
--- tags/Safari-604.1.5.0.1/Source/WebCore/ChangeLog 2017-01-28 07:02:13 UTC (rev 211326)
+++ tags/Safari-604.1.5.0.1/Source/WebCore/ChangeLog 2017-01-28 07:03:05 UTC (rev 211327)
@@ -1,3 +1,15 @@
+2017-01-27 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r211324.
+
+ 2017-01-27 Andy Estes <aes...@apple.com>
+
+ Fix the iOS build when USE(QUICK_LOOK) is disabled.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setQuickLookPassword):
+ * testing/Internals.h:
+
2017-01-26 Chris Dumez <cdu...@apple.com>
Revert r210474 it is no longer needed
Modified: tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.cpp (211326 => 211327)
--- tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.cpp 2017-01-28 07:02:13 UTC (rev 211326)
+++ tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.cpp 2017-01-28 07:03:05 UTC (rev 211327)
@@ -3642,12 +3642,16 @@
return accessKeyModifierStrings;
}
-#if USE(QUICK_LOOK)
+#if PLATFORM(IOS)
void Internals::setQuickLookPassword(const String& password)
{
+#if USE(QUICK_LOOK)
auto& quickLookHandleClient = MockQuickLookHandleClient::singleton();
QuickLookHandle::setClientForTesting(&quickLookHandleClient);
quickLookHandleClient.setPassword(password);
+#else
+ UNUSED_PARAM(password);
+#endif
}
#endif
Modified: tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.h (211326 => 211327)
--- tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.h 2017-01-28 07:02:13 UTC (rev 211326)
+++ tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.h 2017-01-28 07:03:05 UTC (rev 211327)
@@ -520,7 +520,7 @@
Vector<String> accessKeyModifiers() const;
-#if USE(QUICK_LOOK)
+#if PLATFORM(IOS)
void setQuickLookPassword(const String&);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
