Title: [168736] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168735 => 168736)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 21:14:39 UTC (rev 168735)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 21:17:10 UTC (rev 168736)
@@ -1,5 +1,15 @@
2014-05-13 Lucas Forschler <[email protected]>
+ Merge r168552
+
+ 2014-05-09 Tim Horton <[email protected]>
+
+ Fix the iOS DRT build by including CG headers in WKPreferences.h, which uses CGFloat.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+
+2014-05-13 Lucas Forschler <[email protected]>
+
Merge r168541
2014-05-09 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (168735 => 168736)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-05-13 21:14:39 UTC (rev 168735)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-05-13 21:17:10 UTC (rev 168736)
@@ -23,6 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <CoreGraphics/CoreGraphics.h>
#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
