Title: [175665] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175665
- Author
- dburk...@apple.com
- Date
- 2014-11-05 21:19:06 -0800 (Wed, 05 Nov 2014)
Log Message
Merged r175568. <rdar://problems/18840102>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175664 => 175665)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:14:01 UTC (rev 175664)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:19:06 UTC (rev 175665)
@@ -1,5 +1,16 @@
2014-11-05 Dana Burkart <dburk...@apple.com>
+ Merge r175568. <rdar://problem/18840102>
+
+ 2014-11-04 Csaba Osztrogonác <o...@webkit.org>
+
+ URTBF after r175564 for !PLATFORM(COCOA).
+
+ * Shared/TextIndicator.cpp:
+
+
+2014-11-05 Dana Burkart <dburk...@apple.com>
+
Merge r175564. <rdar://problem/18840102>
2014-11-04 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.cpp (175664 => 175665)
--- branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.cpp 2014-11-06 05:14:01 UTC (rev 175664)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.cpp 2014-11-06 05:19:06 UTC (rev 175665)
@@ -26,7 +26,10 @@
#include "config.h"
#include "TextIndicator.h"
+#if PLATFORM(COCOA)
#include "ArgumentCodersCF.h"
+#endif
+
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include "ShareableBitmap.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
