Title: [177556] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177556
- Author
- [email protected]
- Date
- 2014-12-18 18:56:56 -0800 (Thu, 18 Dec 2014)
Log Message
Merged r177525. rdar://problems/19288547
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177555 => 177556)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-19 02:56:54 UTC (rev 177555)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-19 02:56:56 UTC (rev 177556)
@@ -1,5 +1,16 @@
2014-12-18 Matthew Hanson <[email protected]>
+ Merge r177525. rdar://problem/19288547
+
+ 2014-12-18 Timothy Horton <[email protected]>
+
+ Fix the build.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setPreviewOverrideImage:]):
+
+2014-12-18 Matthew Hanson <[email protected]>
+
Merge r177522. rdar://problem/19288547
2014-12-18 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (177555 => 177556)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-19 02:56:54 UTC (rev 177555)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-19 02:56:56 UTC (rev 177556)
@@ -4359,7 +4359,9 @@
- (void)_setPreviewOverrideImage:(NSImage *)image
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[_data->_immediateActionController setPreviewOverrideImage:image];
+#endif
}
- (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (177555 => 177556)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-12-19 02:56:54 UTC (rev 177555)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-12-19 02:56:56 UTC (rev 177556)
@@ -24,7 +24,6 @@
*/
#import "WKViewPrivate.h"
-
#import "PluginComplexTextInputState.h"
#import "SameDocumentNavigationType.h"
#import "WebFindOptions.h"
@@ -38,6 +37,10 @@
class DataReference;
}
+namespace API {
+class Object;
+}
+
namespace WebCore {
class Image;
class SharedBuffer;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
