Title: [207606] branches/safari-602-branch/Source/WebCore
- Revision
- 207606
- Author
- matthew_han...@apple.com
- Date
- 2016-10-20 03:00:11 -0700 (Thu, 20 Oct 2016)
Log Message
Merge r207157. rdar://problem/28857500
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207605 => 207606)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 10:00:08 UTC (rev 207605)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 10:00:11 UTC (rev 207606)
@@ -1,5 +1,19 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r207157. rdar://problem/28857500
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ [iOS] Sandbox QuickLook previews
+ https://bugs.webkit.org/show_bug.cgi?id=163240
+ <rdar://problem/25961633>
+
+ Fix bad merge following r207151.
+
+ * platform/network/cf/ResourceResponse.h: Define m_isQuickLook.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r207155. rdar://problem/28857500
2016-10-11 Daniel Bates <daba...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/network/cf/ResourceResponse.h (207605 => 207606)
--- branches/safari-602-branch/Source/WebCore/platform/network/cf/ResourceResponse.h 2016-10-20 10:00:08 UTC (rev 207605)
+++ branches/safari-602-branch/Source/WebCore/platform/network/cf/ResourceResponse.h 2016-10-20 10:00:11 UTC (rev 207606)
@@ -113,6 +113,10 @@
unsigned m_initLevel : 3;
+#if USE(QUICK_LOOK)
+ bool m_isQuickLook { false };
+#endif
+
#if USE(CFNETWORK)
mutable RetainPtr<CFURLResponseRef> m_cfResponse;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
