Remove a PLATFORM(IOS) from WebKit Private Header

https://bugs.webkit.org/show_bug.cgi?id=124014

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-11-07
Reviewed by Timothy Hatcher.

Source/WebKit/ios:

* WebKit.iOS.exp:

Source/WebKit/mac:

Make the previously iOS only WebInspectorDidStartSearchingForNode
and WebInspectorDidStopSearchingForNode notifications non iOS specific.

* WebCoreSupport/WebInspectorClient.h:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorClient::didSetSearchingForNode):
* WebInspector/WebInspector.h:
* WebInspector/WebInspector.mm:
* WebKit.exp:

Canonical link: https://commits.webkit.org/142194@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ios/ChangeLog

@@ -1,3 +1,12 @@
+2013-11-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Remove a PLATFORM(IOS) from WebKit Private Header
+        https://bugs.webkit.org/show_bug.cgi?id=124014
+
+        Reviewed by Timothy Hatcher.
+
+        * WebKit.iOS.exp:
+
 2013-10-29  Andy Estes  <aestes@apple.com>
 
         [iOS] Upstream Source/WebKit/ios/

Source/WebKit/ios/WebKit.iOS.exp

@@ -36,8 +36,6 @@ _WebViewProgressBackgroundColorKey
 _WebViewProgressEstimatedProgressKey
 
 # For WebInspector notifications
-_WebInspectorDidStartSearchingForNode
-_WebInspectorDidStopSearchingForNode
 __WebViewRemoteInspectorHasSessionChangedNotification
 
 # WebKit1 internal types exposed for WebKit2.

Source/WebKit/mac/ChangeLog

@@ -1,3 +1,20 @@
+2013-11-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Remove a PLATFORM(IOS) from WebKit Private Header
+        https://bugs.webkit.org/show_bug.cgi?id=124014
+
+        Reviewed by Timothy Hatcher.
+
+        Make the previously iOS only WebInspectorDidStartSearchingForNode
+        and WebInspectorDidStopSearchingForNode notifications non iOS specific.
+
+        * WebCoreSupport/WebInspectorClient.h:
+        * WebCoreSupport/WebInspectorClient.mm:
+        (WebInspectorClient::didSetSearchingForNode):
+        * WebInspector/WebInspector.h:
+        * WebInspector/WebInspector.mm:
+        * WebKit.exp:
+
 2013-11-07  Mark Lam  <mark.lam@apple.com>
 
         Cosmetic: rename xxxId to xxxID for ScriptId, SourceId, and BreakpointId.

Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h

@@ -73,6 +73,8 @@ class WebInspectorClient : public WebCore::InspectorClient, public WebCore::Insp
     virtual void highlight() OVERRIDE;
     virtual void hideHighlight() OVERRIDE;
 
+    virtual void didSetSearchingForNode(bool) OVERRIDE;
+
     virtual bool sendMessageToFrontend(const String&) OVERRIDE;
 
     bool inspectorStartsAttached();
@@ -97,10 +99,6 @@ class WebInspectorClient : public WebCore::InspectorClient, public WebCore::Insp
     bool canBeRemotelyInspected() const;
 
     WebView *inspectedWebView();
-
-#if PLATFORM(IOS)
-    virtual void didSetSearchingForNode(bool) OVERRIDE FINAL;
-#endif
 #endif
 
 private:

Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

@@ -197,6 +197,18 @@ - (void)destroyInspectorView:(bool)notifyInspectorController;
     [m_highlighter.get() hideHighlight];
 }
 
+void WebInspectorClient::didSetSearchingForNode(bool enabled)
+{
+    WebInspector *inspector = [m_webView inspector];
+
+    ASSERT(isMainThread());
+
+    if (enabled)
+        [[NSNotificationCenter defaultCenter] postNotificationName:WebInspectorDidStartSearchingForNode object:inspector];
+    else
+        [[NSNotificationCenter defaultCenter] postNotificationName:WebInspectorDidStopSearchingForNode object:inspector];
+}
+
 void WebInspectorClient::releaseFrontend()
 {
     m_frontendClient = 0;

Source/WebKit/mac/WebInspector/WebInspector.h

@@ -28,10 +28,8 @@
 
 #import <Foundation/NSObject.h>
 
-#if PLATFORM(IOS)
 extern NSString *WebInspectorDidStartSearchingForNode;
 extern NSString *WebInspectorDidStopSearchingForNode;
-#endif
 
 @class WebView;
 @class WebInspectorFrontend;

Source/WebKit/mac/WebInspector/WebInspector.mm

@@ -6,13 +6,13 @@
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
+ *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
+ *     documentation and/or other materials provided with the distribution.
  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
+ *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -39,10 +39,8 @@
 
 using namespace WebCore;
 
-#if PLATFORM(IOS)
 NSString *WebInspectorDidStartSearchingForNode = @"WebInspectorDidStartSearchingForNode";
 NSString *WebInspectorDidStopSearchingForNode = @"WebInspectorDidStopSearchingForNode";
-#endif
 
 @implementation WebInspector
 - (id)initWithWebView:(WebView *)webView

Source/WebKit/mac/WebKit.exp

@@ -95,6 +95,8 @@ _WebIconMediumSize
 _WebIconNotificationUserInfoURLKey
 _WebIconSmallSize
 _WebInitForCarbon
+_WebInspectorDidStartSearchingForNode
+_WebInspectorDidStopSearchingForNode
 _WebInstallMemoryPressureHandler
 _WebKitErrorDomain
 _WebKitErrorMIMETypeKey