Title: [185005] trunk/Source
- Revision
- 185005
- Author
- ander...@apple.com
- Date
- 2015-05-29 14:46:32 -0700 (Fri, 29 May 2015)
Log Message
WebKit.framework installs or references Mac-only headers on iOS
https://bugs.webkit.org/show_bug.cgi?id=145471
rdar://problem/21161459
Reviewed by Dan Bernstein.
Source/WebKit/mac:
* History/WebURLsWithTitles.h:
Add an #if !TARGET_OS_IPHONE guard around the entire header.
* MigrateHeaders.make:
Don't migrate the NPAPI headers on iOS.
Source/WebKit2:
* UIProcess/API/C/mac/WKInspectorPrivateMac.h:
Add an #if !TARGET_OS_IPHONE guard around the entire header.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (185004 => 185005)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-29 21:20:48 UTC (rev 185004)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-29 21:46:32 UTC (rev 185005)
@@ -1,3 +1,17 @@
+2015-05-29 Anders Carlsson <ander...@apple.com>
+
+ WebKit.framework installs or references Mac-only headers on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=145471
+ rdar://problem/21161459
+
+ Reviewed by Dan Bernstein.
+
+ * History/WebURLsWithTitles.h:
+ Add an #if !TARGET_OS_IPHONE guard around the entire header.
+
+ * MigrateHeaders.make:
+ Don't migrate the NPAPI headers on iOS.
+
2015-05-28 Matt Rajca <mra...@apple.com>
Add ENABLE_MEDIA_SESSION feature flag (which is off by default).
Modified: trunk/Source/WebKit/mac/History/WebURLsWithTitles.h (185004 => 185005)
--- trunk/Source/WebKit/mac/History/WebURLsWithTitles.h 2015-05-29 21:20:48 UTC (rev 185004)
+++ trunk/Source/WebKit/mac/History/WebURLsWithTitles.h 2015-05-29 21:46:32 UTC (rev 185005)
@@ -26,6 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <TargetConditionals.h>
+
+#if !TARGET_OS_IPHONE
+
#import <Cocoa/Cocoa.h>
#define WebURLsWithTitlesPboardType @"WebURLsWithTitlesPboardType"
@@ -53,3 +57,5 @@
+ (NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard;
@end
+
+#endif
Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (185004 => 185005)
--- trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-29 21:20:48 UTC (rev 185004)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2015-05-29 21:46:32 UTC (rev 185005)
@@ -184,12 +184,18 @@
$(PRIVATE_HEADERS_DIR)/DOMXPathResult.h \
$(PRIVATE_HEADERS_DIR)/WebKitAvailability.h \
$(PRIVATE_HEADERS_DIR)/WebScriptObject.h \
+#
+
+ifeq ($(PLATFORM_NAME), macosx)
+all : \
$(PRIVATE_HEADERS_DIR)/npapi.h \
$(PRIVATE_HEADERS_DIR)/npfunctions.h \
$(PRIVATE_HEADERS_DIR)/npruntime.h \
$(PRIVATE_HEADERS_DIR)/nptypes.h \
#
+endif
+
ifneq ($(PLATFORM_NAME), macosx)
all : \
$(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
Modified: trunk/Source/WebKit2/ChangeLog (185004 => 185005)
--- trunk/Source/WebKit2/ChangeLog 2015-05-29 21:20:48 UTC (rev 185004)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-29 21:46:32 UTC (rev 185005)
@@ -1,5 +1,16 @@
2015-05-29 Anders Carlsson <ander...@apple.com>
+ WebKit.framework installs or references Mac-only headers on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=145471
+ rdar://problem/21161459
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/mac/WKInspectorPrivateMac.h:
+ Add an #if !TARGET_OS_IPHONE guard around the entire header.
+
+2015-05-29 Anders Carlsson <ander...@apple.com>
+
WKScriptMessageInternal.h should be a project header, not a private header
https://bugs.webkit.org/show_bug.cgi?id=145464
rdar://problem/21161639
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h (185004 => 185005)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2015-05-29 21:20:48 UTC (rev 185004)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2015-05-29 21:46:32 UTC (rev 185005)
@@ -23,6 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <TargetConditionals.h>
+
+#if !TARGET_OS_IPHONE
+
#import <AppKit/NSWindow.h>
#import <WebKit/WKDeclarationSpecifiers.h>
#import <WebKit/WKInspector.h>
@@ -47,3 +51,5 @@
#ifdef __cplusplus
}
#endif
+
+#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
