Source/WebCore: Clean up exports and headers for iOS.

Don't use ENABLE() macro in an exported header.

* platform/ios/wak/WAKResponder.h:

Source/WebKit/ios: Clean up exports and headers for iOS.

* Misc/WebNSStringDrawing.h: Don't use PLATFORM() macro in an exported header.
* WebCoreSupport/WebFrameIOS.h: Ditto.
* WebCoreSupport/WebSelectionRect.h: Ditto.

Source/WebKit/mac: Clean up exports and headers for iOS.

Need to export WebArchivePboardType on Mac and iOS.

* WebKit.exp:
* WebKit.mac.exp:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2ab8866d9d58fc207e9799d569e56e9bb48bbb27..0d0d8aff324d8957324b42d340ff22f038259b38 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up exports and headers for iOS.
+        
+        Don't use ENABLE() macro in an exported header.
+
+        * platform/ios/wak/WAKResponder.h:
+
 2014-01-14  Daniel Bates  <dabates@apple.com>
 
         [iOS] Move symbol __ZN7WebCore34registerQLPreviewConverterIfNeededEP5NSURLP8NSStringP6NSData to

diff --git a/Source/WebCore/platform/ios/wak/WAKResponder.h b/Source/WebCore/platform/ios/wak/WAKResponder.h
index 2c58eb4c70f132d33c94239b0dce04b1df6b1805..6e9ab12182b6be601f5ff70b8bf0008aab48a2ba 100644 (file)
--- a/Source/WebCore/platform/ios/wak/WAKResponder.h
+++ b/Source/WebCore/platform/ios/wak/WAKResponder.h
@@ -46,9 +46,7 @@
 - (void)mouseExited:(WebEvent *)theEvent;
 - (void)keyDown:(WebEvent *)event;
 - (void)keyUp:(WebEvent *)event;
-#if ENABLE(TOUCH_EVENTS)
 - (void)touch:(WebEvent *)event;
-#endif
 
 - (void)insertText:(NSString *)text;
 

diff --git a/Source/WebKit/ios/ChangeLog b/Source/WebKit/ios/ChangeLog
index a85656b30bb4d7c76f56e9a031f753db9c29a0e9..f1e418fc8aaf93b9aa196b0746b04182ff0ceee8 100644 (file)
--- a/Source/WebKit/ios/ChangeLog
+++ b/Source/WebKit/ios/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up exports and headers for iOS.
+
+        * Misc/WebNSStringDrawing.h: Don't use PLATFORM() macro in an exported header.
+        * WebCoreSupport/WebFrameIOS.h: Ditto.
+        * WebCoreSupport/WebSelectionRect.h: Ditto.
+
 2014-01-14  Dean Jackson  <dino@apple.com>
 
         Remove .objc_class_name_WebInspectorXPCWrapper from export on iOS build.

diff --git a/Source/WebKit/ios/Misc/WebNSStringDrawing.h b/Source/WebKit/ios/Misc/WebNSStringDrawing.h
index 0363550ff90af78dd91ef54e4fc8bbe31bfa25c3..91f96dd44d641cb6a5cdc1e73b5ee50f1306a4f9 100644 (file)
--- a/Source/WebKit/ios/Misc/WebNSStringDrawing.h
+++ b/Source/WebKit/ios/Misc/WebNSStringDrawing.h
@@ -26,7 +26,7 @@
 #ifndef WebNSStringDrawing_h
 #define WebNSStringDrawing_h
 
-#if PLATFORM(IOS)
+#if TARGET_OS_IPHONE
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
@@ -112,6 +112,6 @@ typedef enum {
 
 @end
 
-#endif // PLATFORM(IOS)
+#endif // TARGET_OS_IPHONE
 
 #endif // WebNSStringDrawing_h

diff --git a/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h b/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h
index f2194b441ab061a083c7720a266add1a864e15ce..46fe90cabb91c0a639e791d34847504e16c218be 100644 (file)
--- a/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h
+++ b/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if PLATFORM(IOS)
+#if TARGET_OS_IPHONE
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <WebKit/WebFrame.h>
@@ -95,4 +95,4 @@ typedef enum {
 
 @end
 
-#endif // PLATFORM(IOS)
+#endif // TARGET_OS_IPHONE

diff --git a/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h b/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h
index 2af11dda4bc23fa4e2398babcaaaacebf7ab0dfb..b13558ec3ce41daad094e359fc2f5d3ab621b897 100644 (file)
--- a/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h
+++ b/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if PLATFORM(IOS)
+#if TARGET_OS_IPHONE
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
@@ -58,4 +58,4 @@
 
 @end
 
-#endif // PLATFORM(IOS)
+#endif // TARGET_OS_IPHONE

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 969a91dc3c5ea4adf9870246a46b3a2f300d8c32..aac797ebaa5583b57d8eeb73dc7a3f5981873edc 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up exports and headers for iOS.
+        
+        Need to export WebArchivePboardType on Mac and iOS.
+
+        * WebKit.exp:
+        * WebKit.mac.exp:
+
 2014-01-14  Simon Fraser  <simon.fraser@apple.com>
 
         Fix header availability checks on iOS

diff --git a/Source/WebKit/mac/WebKit.exp b/Source/WebKit/mac/WebKit.exp
index b26780a31231f819805629b82eccb15b1b6fffb8..750936b7d3ab8419ebc195561d3cf9f88c681d45 100644 (file)
--- a/Source/WebKit/mac/WebKit.exp
+++ b/Source/WebKit/mac/WebKit.exp
@@ -38,6 +38,7 @@ _WebActionFormKey
 _WebActionModifierFlagsKey
 _WebActionNavigationTypeKey
 _WebActionOriginalURLKey
+_WebArchivePboardType
 _WebDatabaseDidModifyDatabaseNotification
 _WebDatabaseDidModifyOriginNotification
 _WebDatabaseDirectoryDefaultsKey

diff --git a/Source/WebKit/mac/WebKit.mac.exp b/Source/WebKit/mac/WebKit.mac.exp
index 2d4fa951ca3820909e98d33e8fce33203d96cd41..88a55058542ff74cdf2d29d3ea3f4dc1aa7ec442 100644 (file)
--- a/Source/WebKit/mac/WebKit.mac.exp
+++ b/Source/WebKit/mac/WebKit.mac.exp
@@ -8,7 +8,6 @@
 .objc_class_name_WebURLsWithTitles
 _HIWebViewCreate
 _HIWebViewGetWebView
-_WebArchivePboardType
 _WebConvertNSImageToCGImageRef
 _WebCoreScrollbarAlwaysOn
 _WebIconDatabaseDidAddIconNotification