Title: [176784] tags/Safari-601.1.11/Source/WebKit2
- Revision
- 176784
- Author
- [email protected]
- Date
- 2014-12-03 19:12:06 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176769. rdar://problem/19132975
Modified Paths
Diff
Modified: tags/Safari-601.1.11/Source/WebKit2/ChangeLog (176783 => 176784)
--- tags/Safari-601.1.11/Source/WebKit2/ChangeLog 2014-12-04 03:10:33 UTC (rev 176783)
+++ tags/Safari-601.1.11/Source/WebKit2/ChangeLog 2014-12-04 03:12:06 UTC (rev 176784)
@@ -1,5 +1,21 @@
2014-12-03 Babak Shafiei <[email protected]>
+ Merge r176769.
+
+ 2014-12-03 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r176457.
+ https://bugs.webkit.org/show_bug.cgi?id=139247
+
+ More iOS breakage (Requested by andersca on #webkit).
+
+ Reverted changeset:
+
+ "Fix iOS build."
+ http://trac.webkit.org/changeset/176457
+
+2014-12-03 Babak Shafiei <[email protected]>
+
Merge r176764.
2014-12-03 Commit Queue <[email protected]>
Modified: tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp (176783 => 176784)
--- tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp 2014-12-04 03:10:33 UTC (rev 176783)
+++ tags/Safari-601.1.11/Source/WebKit2/Shared/ios/QuickLookDocumentData.cpp 2014-12-04 03:12:06 UTC (rev 176784)
@@ -59,7 +59,7 @@
encoder << size;
for (const auto& data : m_data)
- encoder.encodeFixedLengthData(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
+ encoder.encodeFixedLengthData(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()), 1);
}
bool QuickLookDocumentData::decode(IPC::ArgumentDecoder& decoder, QuickLookDocumentData& documentData)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
