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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176608 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 94ef098af584d96c41a7d6af5078df9c2c763a97..978896af85a1d8c1ead1cbd0a93f53ee53f762f4 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+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

diff --git a/Source/WebKit/mac/WebView/WebActionMenuController.h b/Source/WebKit/mac/WebView/WebActionMenuController.h
index 6579125fff3c0627771f5c3adf72ca9caceadfa3..d486981d2480488560e0294988a0492181eaa21e 100644 (file)
--- a/Source/WebKit/mac/WebView/WebActionMenuController.h
+++ b/Source/WebKit/mac/WebView/WebActionMenuController.h
@@ -23,8 +23,9 @@
  * 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>
@@ -60,3 +61,5 @@ class TextIndicator;
 - (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event;
 
 @end
+
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000

diff --git a/Source/WebKit/mac/WebView/WebActionMenuController.mm b/Source/WebKit/mac/WebView/WebActionMenuController.mm
index a976a9bf1851c97593204d969b2776f70f0d0a7b..4ea89d305408596ecaf5a2940182b5d5ee714c17 100644 (file)
--- a/Source/WebKit/mac/WebView/WebActionMenuController.mm
+++ b/Source/WebKit/mac/WebView/WebActionMenuController.mm
@@ -25,6 +25,8 @@
 
 #import "WebActionMenuController.h"
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
 #import "DOMElementInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMRangeInternal.h"
@@ -963,3 +965,5 @@ static DictionaryPopupInfo performDictionaryLookupForRange(Frame* frame, Range&
 }
 
 @end
+
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000

diff --git a/Source/WebKit/mac/WebView/WebHTMLView.mm b/Source/WebKit/mac/WebView/WebHTMLView.mm
index 267da344688ac70cf3a5f34f405e41518bf74c6a..6f87258157328819772f2e8ae0d75a379ed050de 100644 (file)
--- a/Source/WebKit/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKit/mac/WebView/WebHTMLView.mm
@@ -3702,11 +3702,14 @@ static void setMenuTargets(NSMenu* menu)
     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)
@@ -3815,7 +3818,7 @@ static void setMenuTargets(NSMenu* menu)
     // 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
 

diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index a9ecacce24c09ece61abb7b0944a38c18f10d353..fe761934c0d39853c5a6c7372db3ea1e448c5e04 100644 (file)
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -8605,11 +8605,13 @@ static void glibContextIterationCallback(CFRunLoopObserverRef, CFRunLoopActivity
     [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
 

diff --git a/Source/WebKit/mac/WebView/WebViewData.h b/Source/WebKit/mac/WebView/WebViewData.h
index 934e9f8d909cacad78982f385a45ed6ce2f2e484..60db10ebcd2fad9a6ee90333f745f807639d712b 100644 (file)
--- a/Source/WebKit/mac/WebView/WebViewData.h
+++ b/Source/WebKit/mac/WebView/WebViewData.h
@@ -147,8 +147,10 @@ private:
     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;
         

diff --git a/Source/WebKit/mac/WebView/WebViewData.mm b/Source/WebKit/mac/WebView/WebViewData.mm
index 4cf6de1795408c5d7aba13e098f42cbe5b371ba8..d0e1c590252070a88cd7344c9f44be74bba3c6ff 100644 (file)
--- a/Source/WebKit/mac/WebView/WebViewData.mm
+++ b/Source/WebKit/mac/WebView/WebViewData.mm
@@ -145,7 +145,9 @@ WebViewLayerFlushScheduler::WebViewLayerFlushScheduler(LayerFlushController* flu
 #endif
     [inspector release];
     [currentNodeHighlight release];
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     [actionMenuController release];
+#endif
     [hostWindow release];
     [policyDelegateForwarder release];
     [UIDelegateForwarder release];

diff --git a/Source/WebKit/mac/WebView/WebViewInternal.h b/Source/WebKit/mac/WebView/WebViewInternal.h
index ba616186ff5c886cafa7fae481d2efc3b94cdcbe..5888bf9dbc8cdab0c88aafb044934e9cd2d78c0d 100644 (file)
--- a/Source/WebKit/mac/WebView/WebViewInternal.h
+++ b/Source/WebKit/mac/WebView/WebViewInternal.h
@@ -259,7 +259,9 @@ OBJC_CLASS NSTextAlternatives;
 #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