REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to...
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Nov 2014 18:57:31 +0000 (18:57 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Nov 2014 18:57:31 +0000 (18:57 +0000)
This regressed with the following commit:

    Move DataDetectors scanning code to WebCore
    https://bugs.webkit.org/show_bug.cgi?id=138731
    <rdar://problem/18877535>

Source/WebCore:

This fixes the following build failures:

    In file included from WebCore/editing/mac/DataDetection.mm:29:
    WebCore/platform/spi/mac/DataDetectorsSPI.h:66:11: error: unknown type name 'NSRect'
    @property NSRect highlightFrame;
              ^
    WebCore/editing/mac/DataDetection.mm:42:28: error: use of undeclared identifier 'DataDetection'
    RetainPtr<DDActionContext> DataDetection::detectItemAroundHitTestResult(const HitTestResult& hitTestResult, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange)
                               ^
    2 errors generated.

* WebCore.exp.in:
(DataDetection::detectItemAroundHitTestResult): Move symbol from
shared section to Mac-only section.
* editing/mac/DataDetection.mm: Add PLATFORM(MAC) check around
the entire implementation since it it unused on iOS.
* platform/spi/mac/DataDetectorsSPI.h: Expand PLATFORM(MAC)
check around DDActionContext class declarations.

Source/WebKit2:

* Shared/mac/ActionMenuHitTestResult.mm: Add PLATFORM(MAC) check
around the entire implementation since it it unused on iOS.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/editing/mac/DataDetection.mm
Source/WebCore/platform/spi/mac/DataDetectorsSPI.h
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm

index 76eb57bd9592102d24402879f511054513b89744..7634a091822a659bd4479ca369920fe65a71e9d5 100644 (file)
@@ -1,3 +1,32 @@
+2014-11-15  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore
+
+        This regressed with the following commit:
+
+            Move DataDetectors scanning code to WebCore
+            https://bugs.webkit.org/show_bug.cgi?id=138731
+            <rdar://problem/18877535>
+
+        This fixes the following build failures:
+
+            In file included from WebCore/editing/mac/DataDetection.mm:29:
+            WebCore/platform/spi/mac/DataDetectorsSPI.h:66:11: error: unknown type name 'NSRect'
+            @property NSRect highlightFrame;
+                      ^
+            WebCore/editing/mac/DataDetection.mm:42:28: error: use of undeclared identifier 'DataDetection'
+            RetainPtr<DDActionContext> DataDetection::detectItemAroundHitTestResult(const HitTestResult& hitTestResult, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange)
+                                       ^
+            2 errors generated.
+
+        * WebCore.exp.in:
+        (DataDetection::detectItemAroundHitTestResult): Move symbol from
+        shared section to Mac-only section.
+        * editing/mac/DataDetection.mm: Add PLATFORM(MAC) check around
+        the entire implementation since it it unused on iOS.
+        * platform/spi/mac/DataDetectorsSPI.h: Expand PLATFORM(MAC)
+        check around DDActionContext class declarations.
+
 2014-11-14  Benjamin Poulain  <benjamin@webkit.org>
 
         Compute the selector specificity as we match simple selectors
index d1f25bb46c18f8a369f0a3704c9e5ad4f0774c23..b137244a0b07802b405a33a8e80237fb53af607c 100644 (file)
@@ -288,7 +288,6 @@ __ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
 __ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
 __ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi
 __ZN7WebCore13ContainerNode11removeChildEPNS_4NodeERi
-__ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
 __ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_
 __ZN7WebCore13GraphicsLayer12setZPositionEf
@@ -2298,6 +2297,7 @@ __ZN7WebCore12EventHandler47handleKeyboardSelectionMovementForAccessibilityEPNS_
 __ZN7WebCore12EventHandler7mouseUpEP7NSEvent
 __ZN7WebCore12EventHandler8keyEventEP7NSEvent
 __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
+__ZN7WebCore13DataDetection29detectItemAroundHitTestResultERKNS_13HitTestResultERNS_9FloatRectERN3WTF6RefPtrINS_5RangeEEE
 __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
index 56763741af78a13f6b4ae4f801a80d974d67352d..98faffa26d361c02e1e14bf04d1642c78ba2ad00 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "DataDetection.h"
 
+#if PLATFORM(MAC)
+
 #import "DataDetectorsSPI.h"
 #import "DictionaryLookup.h"
 #import "FrameView.h"
@@ -100,3 +102,5 @@ RetainPtr<DDActionContext> DataDetection::detectItemAroundHitTestResult(const Hi
 }
 
 } // namespace WebCore
+
+#endif // PLATFORM(MAC)
index 4b304f4377971729b792251134408fc1af5fa0a5..151a63aed8d7d3276a2489ddb92410df9d8d3526 100644 (file)
@@ -58,8 +58,8 @@ SOFT_LINK(DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (r
 
 }
 
+#if PLATFORM(MAC)
 SOFT_LINK_CLASS(DataDetectors, DDActionContext)
-SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
 
 @interface DDActionContext : NSObject <NSCopying, NSSecureCoding>
 
@@ -69,11 +69,12 @@ SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
 @property (copy) void (^completionHandler)(void);
 @property (assign) BOOL forActionMenuContent;
 
-#if PLATFORM(MAC)
 - (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
-#endif
 
 @end
+#endif
+
+SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
 
 @interface DDActionsManager : NSObject
 
index 583242712eaba8d76993d10eb6edbc51c17d4254..e1c001959ca975fdbf5b8af12babdeeb3e3def06 100644 (file)
@@ -1,3 +1,16 @@
+2014-11-15  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore
+
+        This regressed with the following commit:
+
+            Move DataDetectors scanning code to WebCore
+            https://bugs.webkit.org/show_bug.cgi?id=138731
+            <rdar://problem/18877535>
+
+        * Shared/mac/ActionMenuHitTestResult.mm: Add PLATFORM(MAC) check
+        around the entire implementation since it it unused on iOS.
+
 2014-11-14  Anders Carlsson  <andersca@apple.com>
 
         Raise an exception if -[WKWebView initWithFrame:configuration:] is passed a nil configuration
index 0c90e43c667e6fe4cc46c4d8cdb2a8907b4e5162..1dfbc32b497f2077d578eed628bcee4fc73d5faf 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "ActionMenuHitTestResult.h"
 
+#if PLATFORM(MAC)
+
 #import "ArgumentCodersCF.h"
 #import "ArgumentDecoder.h"
 #import "ArgumentEncoder.h"
@@ -127,3 +129,5 @@ bool ActionMenuHitTestResult::decode(IPC::ArgumentDecoder& decoder, ActionMenuHi
 }
     
 } // namespace WebKit
+
+#endif // PLATFORM(MAC)