Diff
Modified: trunk/Source/WebKit2/ChangeLog (124162 => 124163)
--- trunk/Source/WebKit2/ChangeLog 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-31 03:15:51 UTC (rev 124163)
@@ -1,3 +1,23 @@
+2012-07-30 Sam Weinig <[email protected]>
+
+ Rename WebKit2.h to WebKit2_C.h
+ https://bugs.webkit.org/show_bug.cgi?id=92704
+
+ Reviewed by Dan Bernstein.
+
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * UIProcess/API/C/WebKit2_C.h: Renamed from Source/WebKit2/UIProcess/API/C/WebKit2.h.
+ * UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
+ * UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/API/gtk/WebKitSettingsPrivate.h:
+ * UIProcess/API/gtk/WebKitWebViewPrivate.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Generated.make:
+ Update for changed header file name.
+
2012-07-28 Sam Weinig <[email protected]>
Add ability to load from a string to the ObjC WK API
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (124162 => 124163)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2012-07-31 03:15:51 UTC (rev 124163)
@@ -40,7 +40,7 @@
$(WebKit2)/UIProcess/API/C/soup/WKAPICastSoup.h \
$(WebKit2)/UIProcess/API/C/soup/WKContextSoup.h \
$(WebKit2)/UIProcess/API/C/soup/WKSoupRequestManager.h \
- $(WebKit2)/UIProcess/API/C/WebKit2.h \
+ $(WebKit2)/UIProcess/API/C/WebKit2_C.h \
$(WebKit2)/UIProcess/API/C/WKAPICast.h \
$(WebKit2)/UIProcess/API/C/WKApplicationCacheManager.h \
$(WebKit2)/UIProcess/API/C/WKAuthenticationChallenge.h \
@@ -518,7 +518,7 @@
Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.h \
Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.cpp \
Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.h \
- Source/WebKit2/UIProcess/API/C/WebKit2.h \
+ Source/WebKit2/UIProcess/API/C/WebKit2_C.h \
Source/WebKit2/UIProcess/API/C/WKAPICast.h \
Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h \
Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp \
Modified: trunk/Source/WebKit2/Target.pri (124162 => 124163)
--- trunk/Source/WebKit2/Target.pri 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/Target.pri 2012-07-31 03:15:51 UTC (rev 124163)
@@ -184,7 +184,7 @@
UIProcess/API/C/WKProtectionSpace.h \
UIProcess/API/C/WKProtectionSpaceTypes.h \
UIProcess/API/C/WKVibration.h \
- UIProcess/API/C/WebKit2.h \
+ UIProcess/API/C/WebKit2_C.h \
UIProcess/API/C/qt/WKNativeEvent.h \
UIProcess/API/cpp/WKRetainPtr.h \
UIProcess/API/cpp/qt/WKStringQt.h \
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010 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 WebKit2_h
-#define WebKit2_h
-
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKType.h>
-
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBackForwardList.h>
-#include <WebKit2/WKBackForwardListItem.h>
-#include <WebKit2/WKConnectionRef.h>
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKFormSubmissionListener.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKFramePolicyListener.h>
-#include <WebKit2/WKGeolocationManager.h>
-#include <WebKit2/WKGeolocationPermissionRequest.h>
-#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKGraphicsContext.h>
-#include <WebKit2/WKHitTestResult.h>
-#include <WebKit2/WKMutableArray.h>
-#include <WebKit2/WKMutableDictionary.h>
-#include <WebKit2/WKNavigationData.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKOpenPanelParameters.h>
-#include <WebKit2/WKOpenPanelResultListener.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPreferences.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
-#include <WebKit2/WKURLRequest.h>
-#include <WebKit2/WKURLResponse.h>
-
-#if defined(__OBJC__) && __OBJC__
-#import <WebKit2/WKView.h>
-#elif !((defined(__APPLE__) && __APPLE__) || defined(BUILDING_QT__))
-#include <WebKit2/WKView.h>
-#endif
-
-#endif /* WebKit2_h */
Copied: trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (from rev 124160, trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h) (0 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2010 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 WebKit2_C_h
+#define WebKit2_C_h
+
+#include <WebKit2/WKBase.h>
+#include <WebKit2/WKType.h>
+
+#include <WebKit2/WKArray.h>
+#include <WebKit2/WKBackForwardList.h>
+#include <WebKit2/WKBackForwardListItem.h>
+#include <WebKit2/WKConnectionRef.h>
+#include <WebKit2/WKContext.h>
+#include <WebKit2/WKData.h>
+#include <WebKit2/WKDictionary.h>
+#include <WebKit2/WKError.h>
+#include <WebKit2/WKFormSubmissionListener.h>
+#include <WebKit2/WKFrame.h>
+#include <WebKit2/WKFramePolicyListener.h>
+#include <WebKit2/WKGeolocationManager.h>
+#include <WebKit2/WKGeolocationPermissionRequest.h>
+#include <WebKit2/WKGeolocationPosition.h>
+#include <WebKit2/WKGraphicsContext.h>
+#include <WebKit2/WKHitTestResult.h>
+#include <WebKit2/WKMutableArray.h>
+#include <WebKit2/WKMutableDictionary.h>
+#include <WebKit2/WKNavigationData.h>
+#include <WebKit2/WKNumber.h>
+#include <WebKit2/WKOpenPanelParameters.h>
+#include <WebKit2/WKOpenPanelResultListener.h>
+#include <WebKit2/WKPage.h>
+#include <WebKit2/WKPageGroup.h>
+#include <WebKit2/WKPreferences.h>
+#include <WebKit2/WKString.h>
+#include <WebKit2/WKURL.h>
+#include <WebKit2/WKURLRequest.h>
+#include <WebKit2/WKURLResponse.h>
+
+#if defined(__OBJC__) && __OBJC__
+#import <WebKit2/WKView.h>
+#elif !((defined(__APPLE__) && __APPLE__) || defined(BUILDING_QT__))
+#include <WebKit2/WKView.h>
+#endif
+
+#endif /* WebKit2_C_h */
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -28,7 +28,7 @@
#include "WebBackForwardList.h"
#include "WebKitBackForwardList.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
WebKitBackForwardList* webkitBackForwardListCreate(WKBackForwardListRef);
WebKitBackForwardListItem* webkitBackForwardListItemGetOrCreate(WKBackForwardListItemRef);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -21,7 +21,7 @@
#define WebKitPolicyDecisionPrivate_h
#include "WebKitPolicyDecision.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
void webkitPolicyDecisionSetListener(WebKitPolicyDecision*, WKFramePolicyListenerRef);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -40,7 +40,7 @@
#include <WebKit2/WKSerializedScriptValue.h>
#include <WebKit2/WKSoupRequestManager.h>
#include <WebKit2/WKString.h>
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <glib.h>
#include <wtf/Assertions.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -27,7 +27,7 @@
#define WebKitSettingsPrivate_h
#include "WebKitSettings.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
void webkitSettingsAttachSettingsToPage(WebKitSettings*, WKPageRef);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h (124162 => 124163)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -28,7 +28,7 @@
#define WebKitWebViewPrivate_h
#include "WebKitWebView.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <wtf/text/CString.h>
void webkitWebViewLoadChanged(WebKitWebView*, WebKitLoadEvent);
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (124162 => 124163)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-07-31 03:15:51 UTC (rev 124163)
@@ -729,7 +729,7 @@
BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */; };
BCB0B0E012305AB100B1341E /* UserMessageCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */; };
BCB28CC0120233D9007D99BC /* InjectedBundleMessageKinds.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */; };
- BCB63478116BF10600603215 /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BCB63478116BF10600603215 /* WebKit2_C.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2_C.h */; settings = {ATTRIBUTES = (Public, ); }; };
BCB9E2431120DACA00A137E0 /* WebContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9E2411120DACA00A137E0 /* WebContext.h */; };
BCB9E2441120DACA00A137E0 /* WebContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9E2421120DACA00A137E0 /* WebContext.cpp */; };
BCB9E24B1120E15C00A137E0 /* WKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9E2491120E15C00A137E0 /* WKContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1772,7 +1772,7 @@
BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleUserMessageCoders.h; sourceTree = "<group>"; };
BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageCoders.h; sourceTree = "<group>"; };
BCB28CBF120233D9007D99BC /* InjectedBundleMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleMessageKinds.h; sourceTree = "<group>"; };
- BCB63477116BF10600603215 /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
+ BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
BCB9E2411120DACA00A137E0 /* WebContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContext.h; sourceTree = "<group>"; };
BCB9E2421120DACA00A137E0 /* WebContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContext.cpp; sourceTree = "<group>"; };
@@ -3004,7 +3004,7 @@
children = (
5123CF18133D25E60056F800 /* cg */,
6EE849C41368D9040038D481 /* mac */,
- BCB63477116BF10600603215 /* WebKit2.h */,
+ BCB63477116BF10600603215 /* WebKit2_C.h */,
BCDDB32C124EC2E10048D13C /* WKAPICast.h */,
517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */,
517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */,
@@ -4011,7 +4011,7 @@
51A9E1291315ED35009E7031 /* WebKeyValueStorageManagerMessages.h in Headers */,
51A9E1061315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h in Headers */,
51A9E12B1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h in Headers */,
- BCB63478116BF10600603215 /* WebKit2.h in Headers */,
+ BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
BC59534210FC04520098F82D /* WebLoaderClient.h in Headers */,
33D3A3C2133960B000709BE4 /* WebMediaCacheManager.h in Headers */,
33D3A3C91339617900709BE4 /* WebMediaCacheManagerMessages.h in Headers */,
Modified: trunk/Source/WebKit2/win/WebKit2.vcproj (124162 => 124163)
--- trunk/Source/WebKit2/win/WebKit2.vcproj 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/win/WebKit2.vcproj 2012-07-31 03:15:51 UTC (rev 124163)
@@ -3281,7 +3281,7 @@
Name="C"
>
<File
- RelativePath="..\UIProcess\API\C\WebKit2.h"
+ RelativePath="..\UIProcess\API\C\WebKit2_C.h"
>
</File>
<File
Modified: trunk/Source/WebKit2/win/WebKit2Generated.make (124162 => 124163)
--- trunk/Source/WebKit2/win/WebKit2Generated.make 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Source/WebKit2/win/WebKit2Generated.make 2012-07-31 03:15:51 UTC (rev 124163)
@@ -45,7 +45,7 @@
xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "%ConfigurationBuildDir%\include\WebKit2"
xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "%ConfigurationBuildDir%\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\cg\WKIconDatabaseCG.h" "%ConfigurationBuildDir%\include\WebKit2"
- xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "%ConfigurationBuildDir%\include\WebKit2"
+ xcopy /y /d "..\UIProcess\API\C\WebKit2_C.h" "%ConfigurationBuildDir%\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKApplicationCacheManager.h" "%ConfigurationBuildDir%\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKAuthenticationChallenge.h" "%ConfigurationBuildDir%\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKAuthenticationDecisionListener.h" "%ConfigurationBuildDir%\include\WebKit2"
Modified: trunk/Tools/ChangeLog (124162 => 124163)
--- trunk/Tools/ChangeLog 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/ChangeLog 2012-07-31 03:15:51 UTC (rev 124163)
@@ -1,3 +1,19 @@
+2012-07-30 Sam Weinig <[email protected]>
+
+ Rename WebKit2.h to WebKit2_C.h
+ https://bugs.webkit.org/show_bug.cgi?id=92704
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/MiniBrowser_Prefix.pch:
+ * MiniBrowser/win/BrowserView.h:
+ * TestWebKitAPI/config.h:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+ * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+ * WebKitTestRunner/config.h:
+ Update for changed header file name.
+
2012-07-30 Dirk Pranke <[email protected]>
chromium win compile broken after removing webkit.py
Modified: trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch (124162 => 124163)
--- trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch 2012-07-31 03:15:51 UTC (rev 124163)
@@ -27,7 +27,7 @@
#import <Cocoa/Cocoa.h>
#endif
-#import <WebKit2/WebKit2.h>
+#import <WebKit2/WebKit2_C.h>
#define ENABLE_LOGGING 0
Modified: trunk/Tools/MiniBrowser/win/BrowserView.h (124162 => 124163)
--- trunk/Tools/MiniBrowser/win/BrowserView.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/MiniBrowser/win/BrowserView.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -26,7 +26,7 @@
#ifndef BrowserView_h
#define BrowserView_h
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <string>
class BrowserWindow;
Modified: trunk/Tools/TestWebKitAPI/config.h (124162 => 124163)
--- trunk/Tools/TestWebKitAPI/config.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/TestWebKitAPI/config.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -50,7 +50,7 @@
#include <stdint.h>
#if !PLATFORM(CHROMIUM) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__))
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#endif
#ifdef __clang__
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (124162 => 124163)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-07-31 03:15:51 UTC (rev 124163)
@@ -34,7 +34,7 @@
#include <WebKit2/WKBundlePagePrivate.h>
#include <WebKit2/WKBundlePrivate.h>
#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (124162 => 124163)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp 2012-07-31 03:15:51 UTC (rev 124163)
@@ -43,7 +43,7 @@
#include <WebKit2/WKBundleScriptWorld.h>
#include <WebKit2/WKRetainPtr.h>
#include <WebKit2/WKSerializedScriptValue.h>
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#include <wtf/CurrentTime.h>
#include <wtf/HashMap.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h (124162 => 124163)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -39,7 +39,7 @@
#endif /* defined (BUILDING_GTK__) */
#include <wtf/Platform.h>
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
Modified: trunk/Tools/WebKitTestRunner/config.h (124162 => 124163)
--- trunk/Tools/WebKitTestRunner/config.h 2012-07-31 03:15:20 UTC (rev 124162)
+++ trunk/Tools/WebKitTestRunner/config.h 2012-07-31 03:15:51 UTC (rev 124163)
@@ -35,7 +35,7 @@
#include <runtime/JSExportMacros.h>
#endif
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
#if PLATFORM(WIN)
#define WTF_USE_CF 1
