Diff
Modified: trunk/Source/WebKit/ios/ChangeLog (158883 => 158884)
--- trunk/Source/WebKit/ios/ChangeLog 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/ios/ChangeLog 2013-11-07 23:46:21 UTC (rev 158884)
@@ -1,3 +1,12 @@
+2013-11-07 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
[iOS] Upstream Source/WebKit/ios/
Modified: trunk/Source/WebKit/ios/WebKit.iOS.exp (158883 => 158884)
--- trunk/Source/WebKit/ios/WebKit.iOS.exp 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/ios/WebKit.iOS.exp 2013-11-07 23:46:21 UTC (rev 158884)
@@ -36,8 +36,6 @@
_WebViewProgressEstimatedProgressKey
# For WebInspector notifications
-_WebInspectorDidStartSearchingForNode
-_WebInspectorDidStopSearchingForNode
__WebViewRemoteInspectorHasSessionChangedNotification
# WebKit1 internal types exposed for WebKit2.
Modified: trunk/Source/WebKit/mac/ChangeLog (158883 => 158884)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-07 23:46:21 UTC (rev 158884)
@@ -1,3 +1,20 @@
+2013-11-07 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
Cosmetic: rename xxxId to xxxID for ScriptId, SourceId, and BreakpointId.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (158883 => 158884)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2013-11-07 23:46:21 UTC (rev 158884)
@@ -73,6 +73,8 @@
virtual void highlight() OVERRIDE;
virtual void hideHighlight() OVERRIDE;
+ virtual void didSetSearchingForNode(bool) OVERRIDE;
+
virtual bool sendMessageToFrontend(const String&) OVERRIDE;
bool inspectorStartsAttached();
@@ -97,11 +99,7 @@
bool canBeRemotelyInspected() const;
WebView *inspectedWebView();
-
-#if PLATFORM(IOS)
- virtual void didSetSearchingForNode(bool) OVERRIDE FINAL;
#endif
-#endif
private:
PassOwnPtr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (158883 => 158884)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-11-07 23:46:21 UTC (rev 158884)
@@ -197,6 +197,18 @@
[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;
Modified: trunk/Source/WebKit/mac/WebInspector/WebInspector.h (158883 => 158884)
--- trunk/Source/WebKit/mac/WebInspector/WebInspector.h 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/WebInspector/WebInspector.h 2013-11-07 23:46:21 UTC (rev 158884)
@@ -28,10 +28,8 @@
#import <Foundation/NSObject.h>
-#if PLATFORM(IOS)
extern NSString *WebInspectorDidStartSearchingForNode;
extern NSString *WebInspectorDidStopSearchingForNode;
-#endif
@class WebView;
@class WebInspectorFrontend;
Modified: trunk/Source/WebKit/mac/WebInspector/WebInspector.mm (158883 => 158884)
--- trunk/Source/WebKit/mac/WebInspector/WebInspector.mm 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/WebInspector/WebInspector.mm 2013-11-07 23:46:21 UTC (rev 158884)
@@ -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
Modified: trunk/Source/WebKit/mac/WebKit.exp (158883 => 158884)
--- trunk/Source/WebKit/mac/WebKit.exp 2013-11-07 23:45:56 UTC (rev 158883)
+++ trunk/Source/WebKit/mac/WebKit.exp 2013-11-07 23:46:21 UTC (rev 158884)
@@ -95,6 +95,8 @@
_WebIconNotificationUserInfoURLKey
_WebIconSmallSize
_WebInitForCarbon
+_WebInspectorDidStartSearchingForNode
+_WebInspectorDidStopSearchingForNode
_WebInstallMemoryPressureHandler
_WebKitErrorDomain
_WebKitErrorMIMETypeKey
