Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (161478 => 161479)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-08 03:26:02 UTC (rev 161479)
@@ -1,3 +1,37 @@
+2014-01-02 Andy Estes <[email protected]>
+
+ [iOS] Clean up some exported headers
+ https://bugs.webkit.org/show_bug.cgi?id=126403
+
+ Reviewed by Simon Fraser.
+
+ Public header files that are completely excluded on iOS don't need
+ !TARGET_OS_IPHONE guards since they are already listed in
+ EXCLUDED_SOURCE_FILE_NAMES.
+
+ I also took the opportunity to sort EXCLUDED_SOURCE_FILE_NAMES and to
+ clean up some #imports.
+
+ * Configurations/WebKit.xcconfig:
+ * Misc/WebCache.h:
+ * Misc/WebIconDatabasePrivate.h:
+ * Misc/WebLocalizableStrings.h:
+ * Misc/WebNSEventExtras.h:
+ * Misc/WebNSPasteboardExtras.h:
+ * Misc/WebNSWindowExtras.h:
+ * Panels/WebPanelAuthenticationHandler.h:
+ * Plugins/WebPluginsPrivate.h:
+ * Storage/WebDatabaseManagerPrivate.h:
+ * WebCoreSupport/WebJavaScriptTextInputPanel.h:
+ * WebCoreSupport/WebKeyGenerator.h:
+ * WebCoreSupport/WebSecurityOriginPrivate.h:
+ * WebView/WebDashboardRegion.h:
+ * WebView/WebDynamicScrollBarsView.h:
+ * WebView/WebFrameView.h:
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebResourceLoadDelegatePrivate.h:
+ * WebView/WebView.h:
+
2014-01-07 Seokju Kwon <[email protected]>
Web Inspector: Remove leftover 'device metrics' code
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161478 => 161479)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-08 03:26:02 UTC (rev 161479)
@@ -25,9 +25,9 @@
#include "Version.xcconfig"
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff WebIconDatabase.h WebIconDatabasePrivate.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebPluginsPrivate.h WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebDashboardRegion.h WebDynamicScrollBarsView.h;
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff WebDashboardRegion.h WebDynamicScrollBarsView.h WebIconDatabase.h WebIconDatabasePrivate.h WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebPluginsPrivate.h;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebGeolocationCoreLocationProvider.h WebGeolocationProviderIOS.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebUIKitSupport.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationPrivate.h WebMIMETypeRegistry.h WebSelectionRect.h WebVisiblePosition.h WebUIKitDelegate.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h;
+EXCLUDED_SOURCE_FILE_NAMES_macosx = MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <WebKit/WebIconDatabase.h>
// FIXME: Some of the following is not API and should be moved
@@ -69,5 +67,3 @@
+ (void)_checkIntegrityBeforeOpening;
@end
-
-#endif // !TARGET_OS_IPHONE
Modified: trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <AppKit/AppKit.h>
@interface NSEvent (WebExtras)
@@ -41,5 +39,3 @@
-(BOOL)_web_isTabKeyEvent;
@end
-
-#endif
Modified: trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <Foundation/Foundation.h>
@class DOMElement;
@@ -89,5 +87,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif // !TARGET_OS_IPHONE
Modified: trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <Cocoa/Cocoa.h>
@interface NSWindow (WebExtras)
@@ -35,5 +33,3 @@
- (void)centerOverMainWindow;
- (void)makeResponder:(NSResponder *)responder firstResponderIfDescendantOfView:(NSView *)view;
@end
-
-#endif
Modified: trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <Foundation/Foundation.h>
#import <Foundation/NSURLCredentialStorage.h>
@@ -45,5 +43,3 @@
- (void)cancelAuthentication:(NSURLAuthenticationChallenge *)challenge;
@end
-
-#endif
Modified: trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,12 +26,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
// WebPluginWillPresentNativeUserInterfaceNotification is sent by plugins to notify the WebKit client
// application that the plugin will present a dialog or some other "native" user interface to the user.
// This is currently only needed by Dashboard, which must hide itself when a plugin presents a dialog
// box (4318632).
extern NSString *WebPluginWillPresentNativeUserInterfaceNotification;
-
-#endif
Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h (161478 => 161479)
--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,6 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+// FIXME: We shouldn't use ENABLE() macros in exported headers
#if ENABLE(SQL_DATABASE)
extern NSString *WebDatabaseDirectoryDefaultsKey;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h (161478 => 161479)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#import <Cocoa/Cocoa.h>
@interface WebJavaScriptTextInputPanel : NSWindowController
@@ -43,5 +41,3 @@
- (IBAction)pressedOK:(id)sender;
@end
-
-#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h (161478 => 161479)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
typedef enum {
WebCertificateParseResultSucceeded = 0,
WebCertificateParseResultFailed = 1,
@@ -41,5 +39,3 @@
@end
#endif
-
-#endif
Modified: trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h (161478 => 161479)
--- trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !TARGET_OS_IPHONE
-
#if !defined(ENABLE_DASHBOARD_SUPPORT)
#define ENABLE_DASHBOARD_SUPPORT 1
#endif
@@ -51,5 +49,3 @@
@end
#endif
-
-#endif
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (161478 => 161479)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
+
#if !TARGET_OS_IPHONE
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.h (161478 => 161479)
--- trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-08 02:41:59 UTC (rev 161478)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-08 03:26:02 UTC (rev 161479)
@@ -26,8 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
+
#if !TARGET_OS_IPHONE
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
#if !defined(IBAction)
