Changeset 211327 in webkit

Timestamp:

Jan 27, 2017, 11:03:05 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merged r211324. rdar://problem/30247500

Location:

tags/Safari-604.1.5.0.1/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)
• testing/Internals.h (modified) (1 diff)

tags/Safari-604.1.5.0.1/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-27  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r211324.
+
+    2017-01-27  Andy Estes  <aestes@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  <cdumez@apple.com>
 

tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.cpp

@@ -3643 +3643 @@
 }
 
+#if PLATFORM(IOS)
+void Internals::setQuickLookPassword(const String& password)
+{
 #if USE(QUICK_LOOK)
-void Internals::setQuickLookPassword(const String& password)
-{
     auto& quickLookHandleClient = MockQuickLookHandleClient::singleton();
     QuickLookHandle::setClientForTesting(&quickLookHandleClient);
     quickLookHandleClient.setPassword(password);
+#else
+    UNUSED_PARAM(password);
+#endif
 }
 #endif

tags/Safari-604.1.5.0.1/Source/WebCore/testing/Internals.h

@@ -521 +521 @@
     Vector<String> accessKeyModifiers() const;
 
-#if USE(QUICK_LOOK)
+#if PLATFORM(IOS)
     void setQuickLookPassword(const String&);
 #endif