Rename WebKit2.h to WebKit2_C.h

https://bugs.webkit.org/show_bug.cgi?id=92704 Reviewed by Dan Bernstein. Source/WebKit2: * 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. Tools: * 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@124163 268f45cc-cd09-0410-ab3c-d52691b4dbfc
mikewest · Jul 31, 2012 · c6486fb · c6486fb
1 parent 668d6d5
commit c6486fb
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 24 deletions.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2012-07-30  Sam Weinig  <sam@webkit.org>
+
+        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  <sam@webkit.org>
 
         Add ability to load from a string to the ObjC WK API

diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am
@@ -40,7 +40,7 @@ webkit2_h_api += \
 	$(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 @@ webkit2_sources += \
 	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 \

diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri
@@ -184,7 +184,7 @@ HEADERS += \
     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 \

diff --git a/Source/WebKit2/UIProcess/API/C/WebKit2.h → Source/WebKit2/UIProcess/API/C/WebKit2_C.h b/Source/WebKit2/UIProcess/API/C/WebKit2.h → Source/WebKit2/UIProcess/API/C/WebKit2_C.h
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebKit2_h
-#define WebKit2_h
+#ifndef WebKit2_C_h
+#define WebKit2_C_h
 
 #include <WebKit2/WKBase.h>
 #include <WebKit2/WKType.h>
@@ -65,4 +65,4 @@
 #include <WebKit2/WKView.h>
 #endif
 
-#endif /* WebKit2_h */
+#endif /* WebKit2_C_h */
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h
@@ -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);

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h
@@ -21,7 +21,7 @@
 #define WebKitPolicyDecisionPrivate_h
 
 #include "WebKitPolicyDecision.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
 
 void webkitPolicyDecisionSetListener(WebKitPolicyDecision*, WKFramePolicyListenerRef);
 

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
@@ -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>
 

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitSettingsPrivate.h
@@ -27,7 +27,7 @@
 #define WebKitSettingsPrivate_h
 
 #include "WebKitSettings.h"
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
 
 void webkitSettingsAttachSettingsToPage(WebKitSettings*, WKPageRef);
 

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
@@ -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);

diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -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 */,

diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj
@@ -3281,7 +3281,7 @@
 					Name="C"
 					>
 					<File
-						RelativePath="..\UIProcess\API\C\WebKit2.h"
+						RelativePath="..\UIProcess\API\C\WebKit2_C.h"
 						>
 					</File>
 					<File

diff --git a/Source/WebKit2/win/WebKit2Generated.make b/Source/WebKit2/win/WebKit2Generated.make
@@ -45,7 +45,7 @@ all:
     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"

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-30  Sam Weinig  <sam@webkit.org>
+
+        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  <dpranke@chromium.org>
 
         chromium win compile broken after removing webkit.py

diff --git a/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch b/Tools/MiniBrowser/mac/MiniBrowser_Prefix.pch
@@ -27,7 +27,7 @@
     #import <Cocoa/Cocoa.h>
 #endif
 
-#import <WebKit2/WebKit2.h>
+#import <WebKit2/WebKit2_C.h>
 
 #define ENABLE_LOGGING 0
 

diff --git a/Tools/MiniBrowser/win/BrowserView.h b/Tools/MiniBrowser/win/BrowserView.h
@@ -26,7 +26,7 @@
 #ifndef BrowserView_h
 #define BrowserView_h
 
-#include <WebKit2/WebKit2.h>
+#include <WebKit2/WebKit2_C.h>
 #include <string>
 
 class BrowserWindow;

diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
@@ -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__

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -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>

diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -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>

diff --git a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
@@ -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|

diff --git a/Tools/WebKitTestRunner/config.h b/Tools/WebKitTestRunner/config.h
@@ -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