* WebView/WebActionMenuController.h:
* WebView/WebActionMenuController.mm:
* WebView/WebHTMLView.mm:
(-[WebHTMLView scrollWheel:scrollWheel:]):
(-[WebHTMLView mouseDown:mouseDown:]):
* WebView/WebView.mm:
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
(-[WebViewPrivate dealloc]):
* WebView/WebViewInternal.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176608
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-12-01 Timothy Horton <timothy_horton@apple.com>
+
+ Fix the iOS build.
+
+ * WebView/WebActionMenuController.h:
+ * WebView/WebActionMenuController.mm:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView scrollWheel:scrollWheel:]):
+ (-[WebHTMLView mouseDown:mouseDown:]):
+ * WebView/WebView.mm:
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+ * WebView/WebViewInternal.h:
+
2014-12-01 Tim Horton <timothy_horton@apple.com>
Implement yellow highlight for WebKit1 data detectors
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WebUIDelegatePrivate.h"
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#import "WebUIDelegatePrivate.h"
#import <AppKit/NSSharingService.h>
#import <WebCore/HitTestResult.h>
#import <wtf/RetainPtr.h>
- (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event;
@end
+
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
#import "WebActionMenuController.h"
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
#import "DOMElementInternal.h"
#import "DOMNodeInternal.h"
#import "DOMRangeInternal.h"
}
@end
+
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if (!frame || !frame->eventHandler().wheelEvent(event))
[super scrollWheel:event];
- [[[self _webView] _actionMenuController] webView:[self _webView] didHandleScrollWheel:event];
#else
if (frame)
frame->eventHandler().wheelEvent(event);
#endif
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ [[[self _webView] _actionMenuController] webView:[self _webView] didHandleScrollWheel:event];
+#endif
}
#if !PLATFORM(IOS)
// Record the mouse down position so we can determine drag hysteresis.
[self _setMouseDownEvent:event];
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[[[self _webView] _actionMenuController] webView:[self _webView] willHandleMouseDown:event];
#endif
[self _setTextIndicator:nullptr fadeOut:NO animationCompletionHandler:^ { }];
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (WebActionMenuController *)_actionMenuController
{
return _private->actionMenuController;
}
-#endif
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#endif // PLATFORM(MAC)
@end
WebInspector *inspector;
WebNodeHighlight *currentNodeHighlight;
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
WebActionMenuController *actionMenuController;
std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
+#endif
BOOL allowsUndo;
#endif
[inspector release];
[currentNodeHighlight release];
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
[actionMenuController release];
+#endif
[hostWindow release];
[policyDelegateForwarder release];
[UIDelegateForwarder release];
#if PLATFORM(MAC) && defined(__cplusplus)
- (void)_setTextIndicator:(WebCore::TextIndicator*)textIndicator fadeOut:(BOOL)fadeOut animationCompletionHandler:(std::function<void ()>)completionHandler;
- (void)_clearTextIndicator;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- (WebActionMenuController *)_actionMenuController;
#endif
+#endif
@end