Diff
Modified: trunk/Source/WebKit2/ChangeLog (155769 => 155770)
--- trunk/Source/WebKit2/ChangeLog 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-14 17:06:43 UTC (rev 155770)
@@ -1,3 +1,48 @@
+2013-09-14 Dan Bernstein <m...@apple.com>
+
+ [mac] Public header WKBase.h imports a private header, WKBaseMac.h
+ https://bugs.webkit.org/show_bug.cgi?id=121216
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/c/WKBase.h: Moved definitions of enums and WK_EXPORT and WK_INLINE macros
+ out of this files.
+ * Shared/API/c/WKDeclarationSpecifiers.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
+ Contains definitions of WK_EXPORT and WK_INLINE.
+ * Shared/API/c/WKSharedAPICast.h: Added #includes.
+ * Shared/API/c/WKUserContentInjectedFrames.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
+ Contains enum definition.
+ * Shared/API/c/WKUserScriptInjectionTime.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
+ Contains enum definition.
+ * UIProcess/API/C/WKPageGroup.h: Added #includes.
+ * UIProcess/API/mac/WKBrowsingContextController.h: Removed WKBase.h import from this public
+ header, replacing it with WKDeclarationSpecifiers.h import.
+ * UIProcess/API/mac/WKBrowsingContextControllerPrivate.h: Added WKBase.h import.
+ * UIProcess/API/mac/WKBrowsingContextGroup.h: Removed WKBase.h import from this public
+ header, added necessary public imports.
+ * UIProcess/API/mac/WKBrowsingContextGroupPrivate.h: Added WKBase.h import.
+ * UIProcess/API/mac/WKBrowsingContextLoadDelegate.h: Removed WKBase.h import from public
+ header.
+ * UIProcess/API/mac/WKConnection.h: Ditto. Added WKDeclarationSpecifiers.h import.
+ * UIProcess/API/mac/WKConnectionInternal.h: Added WKBase.h import.
+ * UIProcess/API/mac/WKProcessGroup.h: Removed WKBase.h import from public header, added
+ WKDeclarationSpecifiers.h import.
+ * UIProcess/API/mac/WKProcessGroupPrivate.h: Added WKBase.h import.
+ * UIProcess/API/mac/WKView.h: Removed WKBase.h import from public header, added
+ WKDeclarationSpecifiers.h import.
+ * WebKit2.xcodeproj/project.pbxproj: Added new public header files, made WKBase.h private.
+ * WebProcess/InjectedBundle/API/mac/WKDOMNode.h: Removed WKBase.h import from public header,
+ added WKDeclarationSpecifiers.h import.
+ * WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h: Added WKBase.h import.
+ * WebProcess/InjectedBundle/API/mac/WKDOMRange.h: Removed WKBase.h import from public
+ header, added WKDeclarationSpecifiers.h import.
+ * WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h: Added WKBase.h import.
+ * WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h: Removed WKBase.h import from public
+ header, added WKDeclarationSpecifiers.h import.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h: Ditto.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h:
+ Added WKBase.h import.
+
2013-09-14 Alberto Garcia <be...@igalia.com>
[GTK] WebKitGTK+ is linking against libxslt in too many places
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (155769 => 155770)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -27,6 +27,7 @@
#ifndef WKBase_h
#define WKBase_h
+#include <WebKit2/WKDeclarationSpecifiers.h>
#include <stdint.h>
#if defined(BUILDING_GTK__)
@@ -81,18 +82,6 @@
typedef const struct OpaqueWKWebArchive* WKWebArchiveRef;
typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef;
-enum WKUserContentInjectedFrames {
- kWKInjectInAllFrames,
- kWKInjectInTopFrameOnly
-};
-typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
-
-enum WKUserScriptInjectionTime {
- kWKInjectAtDocumentStart,
- kWKInjectAtDocumentEnd
-};
-typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
-
/* WebKit2 main API types */
typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
@@ -158,31 +147,4 @@
typedef const struct OpaqueWKBundleRangeHandle* WKBundleRangeHandleRef;
typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
-#undef WK_EXPORT
-#if defined(WK_NO_EXPORT)
-#define WK_EXPORT
-#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
-#define WK_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
-#if BUILDING_WEBKIT
-#define WK_EXPORT __declspec(dllexport)
-#else
-#define WK_EXPORT __declspec(dllimport)
-#endif
-#else /* !defined(WK_NO_EXPORT) */
-#define WK_EXPORT
-#endif /* defined(WK_NO_EXPORT) */
-
-#if !defined(WK_INLINE)
-#if defined(__cplusplus)
-#define WK_INLINE static inline
-#elif defined(__GNUC__)
-#define WK_INLINE static __inline__
-#elif defined(__WIN32__)
-#define WK_INLINE static __inline
-#else
-#define WK_INLINE static
-#endif
-#endif /* !defined(WK_INLINE) */
-
#endif /* WKBase_h */
Copied: trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (from rev 155754, trunk/Source/WebKit2/Shared/API/c/WKBase.h) (0 => 155770)
--- trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKDeclarationSpecifiers_h
+#define WKDeclarationSpecifiers_h
+
+#undef WK_EXPORT
+#if defined(WK_NO_EXPORT)
+#define WK_EXPORT
+#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
+#define WK_EXPORT __attribute__((visibility("default")))
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
+#if BUILDING_WEBKIT
+#define WK_EXPORT __declspec(dllexport)
+#else
+#define WK_EXPORT __declspec(dllimport)
+#endif
+#else /* !defined(WK_NO_EXPORT) */
+#define WK_EXPORT
+#endif /* defined(WK_NO_EXPORT) */
+
+#if !defined(WK_INLINE)
+#if defined(__cplusplus)
+#define WK_INLINE static inline
+#elif defined(__GNUC__)
+#define WK_INLINE static __inline__
+#elif defined(__WIN32__)
+#define WK_INLINE static __inline
+#else
+#define WK_INLINE static
+#endif
+#endif /* !defined(WK_INLINE) */
+
+#endif /* WKDeclarationSpecifiers_h */
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (155769 => 155770)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -37,6 +37,8 @@
#include "WKPageLoadTypes.h"
#include "WKPageLoadTypesPrivate.h"
#include "WKPageVisibilityTypes.h"
+#include "WKUserContentInjectedFrames.h"
+#include "WKUserScriptInjectionTime.h"
#include "WebError.h"
#include "WebEvent.h"
#include "WebFindOptions.h"
Copied: trunk/Source/WebKit2/Shared/API/c/WKUserContentInjectedFrames.h (from rev 155754, trunk/Source/WebKit2/Shared/API/c/WKBase.h) (0 => 155770)
--- trunk/Source/WebKit2/Shared/API/c/WKUserContentInjectedFrames.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKUserContentInjectedFrames.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKUserContentInjectedFrames_h
+#define WKUserContentInjectedFrames_h
+
+enum WKUserContentInjectedFrames {
+ kWKInjectInAllFrames,
+ kWKInjectInTopFrameOnly
+};
+typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
+
+#endif /* WKUserContentInjectedFrames_h */
Copied: trunk/Source/WebKit2/Shared/API/c/WKUserScriptInjectionTime.h (from rev 155754, trunk/Source/WebKit2/Shared/API/c/WKBase.h) (0 => 155770)
--- trunk/Source/WebKit2/Shared/API/c/WKUserScriptInjectionTime.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKUserScriptInjectionTime.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKUserScriptInjectionTime_h
+#define WKUserScriptInjectionTime_h
+
+enum WKUserScriptInjectionTime {
+ kWKInjectAtDocumentStart,
+ kWKInjectAtDocumentEnd
+};
+typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
+
+#endif /* WKUserScriptInjectionTime_h */
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -27,6 +27,8 @@
#define WKPageGroup_h
#include <WebKit2/WKBase.h>
+#include <WebKit2/WKUserContentInjectedFrames.h>
+#include <WebKit2/WKUserScriptInjectionTime.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,7 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKBrowsingContextControllerData;
@protocol WKBrowsingContextLoadDelegate;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,6 +24,7 @@
*/
#import <WebKit2/WKBrowsingContextController.h>
+#import <WebKit2/WKBase.h>
enum {
WKPaginationModeUnpaginated,
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,8 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit2/WKUserScriptInjectionTime.h>
@class WKBrowsingContextGroupData;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,6 +24,7 @@
*/
#import <WebKit2/WKBrowsingContextGroup.h>
+#import <WebKit2/WKBase.h>
@interface WKBrowsingContextGroup (Private)
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextLoadDelegate.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextLoadDelegate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextLoadDelegate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,6 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
@class WKBrowsingContextController;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,7 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKConnection, WKConnectionData;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,6 +24,7 @@
*/
#import <WebKit2/WKConnection.h>
+#import <WebKit2/WKBase.h>
@interface WKConnection (Internal)
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,7 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKProcessGroup, WKProcessGroupData, WKConnection;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,6 +24,7 @@
*/
#import <WebKit2/WKProcessGroup.h>
+#import <WebKit2/WKBase.h>
@interface WKProcessGroup (Private)
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.h (155769 => 155770)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -24,7 +24,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKBrowsingContextController;
@class WKBrowsingContextGroup;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (155769 => 155770)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-09-14 17:06:43 UTC (rev 155770)
@@ -393,6 +393,9 @@
3760881F150413E900FC82C7 /* WebRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760881D150413E900FC82C7 /* WebRenderObject.h */; };
37608822150414F700FC82C7 /* WKRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37608820150414F700FC82C7 /* WKRenderObject.cpp */; };
37608823150414F700FC82C7 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 37608821150414F700FC82C7 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Public, ); }; };
3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
37948403150C350600E52CE9 /* WebRenderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37948401150C350600E52CE9 /* WebRenderLayer.cpp */; };
37948404150C350600E52CE9 /* WebRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 37948402150C350600E52CE9 /* WebRenderLayer.h */; };
@@ -1004,7 +1007,7 @@
BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
BCDB86C11200FB97007254BE /* WebURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* WebURL.h */; };
- BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
@@ -1813,6 +1816,9 @@
3760881D150413E900FC82C7 /* WebRenderObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderObject.h; sourceTree = "<group>"; };
37608820150414F700FC82C7 /* WKRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRenderObject.cpp; sourceTree = "<group>"; };
37608821150414F700FC82C7 /* WKRenderObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderObject.h; sourceTree = "<group>"; };
+ 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
+ 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
+ 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextControllerPrivate.h; sourceTree = "<group>"; };
37948401150C350600E52CE9 /* WebRenderLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderLayer.cpp; sourceTree = "<group>"; };
37948402150C350600E52CE9 /* WebRenderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebRenderLayer.h; sourceTree = "<group>"; };
@@ -4790,6 +4796,7 @@
51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */,
BC4075DB124FF0270068F20A /* WKData.cpp */,
BC4075DC124FF0270068F20A /* WKData.h */,
+ 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */,
BC4075DD124FF0270068F20A /* WKDictionary.cpp */,
BC4075DE124FF0270068F20A /* WKDictionary.h */,
BC4075DF124FF0270068F20A /* WKError.cpp */,
@@ -4834,8 +4841,10 @@
BC4075F0124FF0270068F20A /* WKURLRequest.h */,
BC4075F1124FF0270068F20A /* WKURLResponse.cpp */,
BC4075F2124FF0270068F20A /* WKURLResponse.h */,
+ 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */,
F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */,
F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */,
+ 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */,
);
name = C;
path = c;
@@ -5311,6 +5320,7 @@
1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */,
BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */,
1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */,
+ 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */,
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
51D130541382EAC000351EDD /* SecItemRequestData.h in Headers */,
51D130561382EAC000351EDD /* SecItemResponseData.h in Headers */,
@@ -5354,6 +5364,7 @@
512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */,
C5E1AFED16B21017006CC1F2 /* WebArchive.h in Headers */,
C5E1AFEF16B21029006CC1F2 /* WebArchiveResource.h in Headers */,
+ 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */,
BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
@@ -5633,6 +5644,7 @@
BC407606124FF0270068F20A /* WKString.h in Headers */,
BC40761A124FF0370068F20A /* WKStringCF.h in Headers */,
BC9099801256A98200083756 /* WKStringPrivate.h in Headers */,
+ 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */,
BC407608124FF0270068F20A /* WKType.h in Headers */,
7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -32,6 +32,9 @@
#include <stdbool.h>
#endif
+#include <WebKit2/WKUserContentInjectedFrames.h>
+#include <WebKit2/WKUserScriptInjectionTime.h>
+
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,7 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKDOMDocument;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,6 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <WebKit2/WKDOMNode.h>
+#import <WebKit2/WKBase.h>
@interface WKDOMNode (WKPrivate)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,7 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKDOMNode, WKDOMDocument;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,6 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <WebKit2/WKDOMRange.h>
+#import <WebKit2/WKBase.h>
@interface WKDOMRange (WKPrivate)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,7 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKDOMRange;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,7 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
@class WKDOMDocument;
@class WKDOMRange;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h (155769 => 155770)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h 2013-09-14 16:19:14 UTC (rev 155769)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h 2013-09-14 17:06:43 UTC (rev 155770)
@@ -26,6 +26,7 @@
#if defined(__LP64__) && defined(__clang__)
#import "WKWebProcessPlugInBrowserContextController.h"
+#import "WKBase.h"
@interface WKWebProcessPlugInBrowserContextController (Internal)
