Inspired and reviewed by Mark Rowe.

        Change non-API includes from JavaScriptCore/ to kjs/ and wtf/ to match prevalent style.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ab489ef..d27547a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2008-07-02  Alexey Proskuryakov  <ap@webkit.org>
+
+        Inspired and reviewed by Mark Rowe.
+
+        Change non-API includes from JavaScriptCore/ to kjs/ and wtf/ to match prevalent style.
+
+        * bindings/objc/ExceptionHandlers.h:
+        * bindings/objc/WebScriptObject.mm:
+        * dom/Document.cpp:
+        * dom/Node.cpp:
+        * page/Frame.cpp:
+        * page/InspectorController.cpp:
+        * page/JavaScriptProfileNode.cpp:
+        * page/mac/FrameMac.mm:
+        * platform/mac/ThreadCheck.mm:
+        * xml/XMLHttpRequest.cpp:
+
 2008-07-02  Simon Hausmann  <hausmann@webkit.org>
 
         Fix the Gtk build.

diff --git a/WebCore/ForwardingHeaders/kjs/DateInstance.h b/WebCore/ForwardingHeaders/kjs/DateInstance.h
new file mode 100644 (file)
index 0000000..2429283
--- /dev/null
+++ b/WebCore/ForwardingHeaders/kjs/DateInstance.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/DateInstance.h>

diff --git a/WebCore/bindings/objc/ExceptionHandlers.h b/WebCore/bindings/objc/ExceptionHandlers.h
index 5f85b9b..911ae2c 100644 (file)
--- a/WebCore/bindings/objc/ExceptionHandlers.h
+++ b/WebCore/bindings/objc/ExceptionHandlers.h
@@ -26,7 +26,7 @@
 #ifndef ExceptionHandlers_h
 #define ExceptionHandlers_h
 
-#include <JavaScriptCore/Assertions.h>
+#include <wtf/Assertions.h>
 
 #if !defined(NDEBUG) && !defined(DISABLE_THREAD_CHECK)
 #define DOM_ASSERT_MAIN_THREAD() do \

diff --git a/WebCore/bindings/objc/WebScriptObject.mm b/WebCore/bindings/objc/WebScriptObject.mm
index f3203c3..17b3118 100644 (file)
--- a/WebCore/bindings/objc/WebScriptObject.mm
+++ b/WebCore/bindings/objc/WebScriptObject.mm
@@ -34,16 +34,16 @@
 #import "JSDOMWindowCustom.h"
 #import "PlatformString.h"
 #import "WebCoreObjCExtras.h"
-#import <JavaScriptCore/ExecState.h>
-#import <JavaScriptCore/APICast.h>
-#import <JavaScriptCore/JSGlobalObject.h>
-#import <JavaScriptCore/JSLock.h>
-#import <JavaScriptCore/completion.h>
-#import <JavaScriptCore/interpreter.h>
 #import "objc_instance.h"
 #import "runtime_root.h"
 #import "runtime.h"
 #import "runtime_object.h"
+#import <JavaScriptCore/APICast.h>
+#import <kjs/ExecState.h>
+#import <kjs/JSGlobalObject.h>
+#import <kjs/JSLock.h>
+#import <kjs/completion.h>
+#import <kjs/interpreter.h>
 
 #ifdef BUILDING_ON_TIGER
 typedef unsigned NSUInteger;

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 40d7922..dab6df0 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -109,7 +109,7 @@
 #include "XMLTokenizer.h"
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
-#include <JavaScriptCore/JSLock.h>
+#include <kjs/JSLock.h>
 
 #if ENABLE(DATABASE)
 #include "Database.h"

diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 9d40664..c291b60 100644 (file)
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -53,7 +53,7 @@
 #include "XMLNames.h"
 #include "htmlediting.h"
 #include "JSDOMBinding.h"
-#include <JavaScriptCore/JSLock.h>
+#include <kjs/JSLock.h>
 
 namespace WebCore {
 

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 5e9bb07..6e6a15c 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -75,7 +75,7 @@
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include "visible_units.h"
-#include <JavaScriptCore/JSLock.h>
+#include <kjs/JSLock.h>
 
 #if FRAME_LOADS_USER_STYLESHEET
 #include "UserStyleSheetLoader.h"

diff --git a/WebCore/page/InspectorController.cpp b/WebCore/page/InspectorController.cpp
index 580fae8..6b79995 100644 (file)
--- a/WebCore/page/InspectorController.cpp
+++ b/WebCore/page/InspectorController.cpp
@@ -66,9 +66,9 @@
 #include "TextIterator.h"
 #include "ScriptController.h"
 #include <JavaScriptCore/APICast.h>
-#include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
+#include <kjs/JSLock.h>
 #include <kjs/ustring.h>
 #include <profiler/Profile.h>
 #include <profiler/Profiler.h>

diff --git a/WebCore/page/JavaScriptProfileNode.cpp b/WebCore/page/JavaScriptProfileNode.cpp
index ec3e2fd..c6538e9 100644 (file)
--- a/WebCore/page/JavaScriptProfileNode.cpp
+++ b/WebCore/page/JavaScriptProfileNode.cpp
@@ -31,9 +31,9 @@
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
+#include <kjs/JSLock.h>
 #include <kjs/JSValue.h>
 
 using namespace KJS;

diff --git a/WebCore/page/mac/FrameMac.mm b/WebCore/page/mac/FrameMac.mm
index ad0ab12..4716224 100644 (file)
--- a/WebCore/page/mac/FrameMac.mm
+++ b/WebCore/page/mac/FrameMac.mm
@@ -89,7 +89,7 @@
 #import "visible_units.h"
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/APICast.h>
-#import <JavaScriptCore/JSLock.h>
+#import <kjs/JSLock.h>
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #import "c_instance.h"

diff --git a/WebCore/platform/mac/ThreadCheck.mm b/WebCore/platform/mac/ThreadCheck.mm
index 92fcd44..6320c70 100644 (file)
--- a/WebCore/platform/mac/ThreadCheck.mm
+++ b/WebCore/platform/mac/ThreadCheck.mm
@@ -27,7 +27,7 @@
 #import "ThreadCheck.h"
 
 #import "StringHash.h"
-#import <JavaScriptCore/HashSet.h>
+#import <wtf/HashSet.h>
 
 namespace WebCore {
 

diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index f398098..64f71f7 100644 (file)
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -41,7 +41,7 @@
 #include "XMLHttpRequestException.h"
 #include "XMLHttpRequestProgressEvent.h"
 #include "markup.h"
-#include <JavaScriptCore/JSLock.h>
+#include <kjs/JSLock.h>
 
 namespace WebCore {
 

diff --git a/WebKit/mac/Carbon/HIViewAdapter.m b/WebKit/mac/Carbon/HIViewAdapter.m
index c0c46af..d11bea4 100644 (file)
--- a/WebKit/mac/Carbon/HIViewAdapter.m
+++ b/WebKit/mac/Carbon/HIViewAdapter.m
@@ -31,7 +31,7 @@
 #import "HIViewAdapter.h"
 
 #import "WebNSObjectExtras.h"
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 static void SetViewNeedsDisplay(HIViewRef inView, RgnHandle inRegion, Boolean inNeedsDisplay);
 

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d2181f6..1ba0ba4 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,47 @@
+2008-07-02  Alexey Proskuryakov  <ap@webkit.org>
+
+        Inspired and reviewed by Mark Rowe.
+
+        Change non-API includes from JavaScriptCore/ to kjs/ and wtf/ to match prevalent style.
+
+        * Carbon/HIViewAdapter.m:
+        * DOM/WebDOMOperations.mm:
+        * DefaultDelegates/WebDefaultContextMenuDelegate.mm:
+        * DefaultDelegates/WebDefaultPolicyDelegate.m:
+        * History/WebBackForwardList.mm:
+        * History/WebHistory.mm:
+        * History/WebHistoryItem.mm:
+        * History/WebHistoryItemInternal.h:
+        * Misc/WebCoreStatistics.mm:
+        * Misc/WebDownload.m:
+        * Misc/WebGraphicsExtras.c:
+        * Misc/WebKitLogging.h:
+        * Misc/WebKitSystemBits.m:
+        * Misc/WebLocalizableStrings.m:
+        * Misc/WebNSArrayExtras.m:
+        * Misc/WebNSDataExtras.m:
+        * Misc/WebNSDictionaryExtras.m:
+        * Misc/WebNSFileManagerExtras.m:
+        * Misc/WebNSPasteboardExtras.mm:
+        * Misc/WebNSURLExtras.mm:
+        * Misc/WebNSUserDefaultsExtras.m:
+        * Panels/WebAuthenticationPanel.m:
+        * Panels/WebPanelAuthenticationHandler.m:
+        * Plugins/WebBaseNetscapePluginView.mm:
+        * Plugins/WebBasePluginPackage.m:
+        * Plugins/WebNetscapePluginEmbeddedView.mm:
+        * Plugins/WebPluginContainerCheck.mm:
+        * Plugins/WebPluginController.mm:
+        * Plugins/WebPluginDatabase.mm:
+        * WebCoreSupport/WebJavaScriptTextInputPanel.m:
+        * WebCoreSupport/WebKeyGenerator.m:
+        * WebCoreSupport/WebViewFactory.mm:
+        * WebKitPrefix.h:
+        * WebView/WebHTMLRepresentation.mm:
+        * WebView/WebPDFRepresentation.m:
+        * WebView/WebPDFView.mm:
+        * WebView/WebScriptDebugger.mm:
+
 2008-07-01  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.

diff --git a/WebKit/mac/DOM/WebDOMOperations.mm b/WebKit/mac/DOM/WebDOMOperations.mm
index 49c7bbf..5ef92f1 100644 (file)
--- a/WebKit/mac/DOM/WebDOMOperations.mm
+++ b/WebKit/mac/DOM/WebDOMOperations.mm
@@ -35,13 +35,13 @@
 #import "WebFrameInternal.h"
 #import "WebFramePrivate.h"
 #import "WebKitNSStringExtras.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/CSSHelper.h>
 #import <WebCore/Document.h>
 #import <WebCore/LegacyWebArchive.h>
 #import <WebCore/markup.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMHTML.h>
+#import <wtf/Assertions.h>
 
 #if ENABLE(SVG)
 #import <WebKit/DOMSVG.h>

diff --git a/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm b/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
index 1d17fdd..2ee7d8b 100644 (file)
--- a/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
+++ b/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
@@ -43,12 +43,12 @@
 #import "WebViewInternal.h"
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/Editor.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebKit/DOM.h>
 #import <WebKit/DOMPrivate.h>
+#import <wtf/Assertions.h>
 
 @implementation WebDefaultUIDelegate (WebContextMenu)
 

diff --git a/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.m b/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.m
index 95502da..af6e465 100644 (file)
--- a/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.m
+++ b/WebKit/mac/DefaultDelegates/WebDefaultPolicyDelegate.m
@@ -36,7 +36,7 @@
 #import <Foundation/NSURLConnection.h>
 #import <Foundation/NSURLRequest.h>
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 
 @implementation WebDefaultPolicyDelegate

diff --git a/WebKit/mac/History/WebBackForwardList.mm b/WebKit/mac/History/WebBackForwardList.mm
index 6423830..6b29a78 100644 (file)
--- a/WebKit/mac/History/WebBackForwardList.mm
+++ b/WebKit/mac/History/WebBackForwardList.mm
@@ -37,7 +37,6 @@
 #import "WebPreferencesPrivate.h"
 #import "WebTypesInternal.h"
 #import "WebViewPrivate.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/BackForwardList.h>
 #import <WebCore/HistoryItem.h>
 #import <WebCore/Page.h>
@@ -45,6 +44,7 @@
 #import <WebCore/Settings.h>
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/WebCoreObjCExtras.h>
+#import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
 
 using namespace WebCore;

diff --git a/WebKit/mac/History/WebHistory.mm b/WebKit/mac/History/WebHistory.mm
index b362312..db0c138 100644 (file)
--- a/WebKit/mac/History/WebHistory.mm
+++ b/WebKit/mac/History/WebHistory.mm
@@ -33,12 +33,12 @@
 #import "WebNSURLExtras.h"
 #import "WebTypesInternal.h"
 #import <Foundation/NSError.h>
-#import <JavaScriptCore/Assertions.h>
-#import <JavaScriptCore/HashMap.h>
-#import <JavaScriptCore/RetainPtr.h>
-#import <JavaScriptCore/Vector.h>
 #import <WebCore/Page.h>
 #import <WebCore/PageGroup.h>
+#import <wtf/Assertions.h>
+#import <wtf/HashMap.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/Vector.h>
 
 using namespace WebCore;
 

diff --git a/WebKit/mac/History/WebHistoryItem.mm b/WebKit/mac/History/WebHistoryItem.mm
index 7d0bb4f..6c8cdcb 100644 (file)
--- a/WebKit/mac/History/WebHistoryItem.mm
+++ b/WebKit/mac/History/WebHistoryItem.mm
@@ -42,7 +42,6 @@
 #import "WebNSViewExtras.h"
 #import "WebPluginController.h"
 #import "WebTypesInternal.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/CachedPage.h>
 #import <WebCore/HistoryItem.h>
 #import <WebCore/Image.h>
@@ -51,6 +50,7 @@
 #import <WebCore/PlatformString.h>
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/WebCoreObjCExtras.h>
+#import <wtf/Assertions.h>
 
 // Private keys used in the WebHistoryItem's dictionary representation.
 // see 3245793 for explanation of "lastVisitedDate"

diff --git a/WebKit/mac/History/WebHistoryItemInternal.h b/WebKit/mac/History/WebHistoryItemInternal.h
index eebfe27..2592ff8 100644 (file)
--- a/WebKit/mac/History/WebHistoryItemInternal.h
+++ b/WebKit/mac/History/WebHistoryItemInternal.h
@@ -28,7 +28,7 @@
 
 #import "WebHistoryItemPrivate.h"
 
-#import <JavaScriptCore/PassRefPtr.h>
+#import <wtf/PassRefPtr.h>
 
 namespace WebCore {
     class HistoryItem;

diff --git a/WebKit/mac/Misc/WebCoreStatistics.mm b/WebKit/mac/Misc/WebCoreStatistics.mm
index f834614..b2bdf28 100644 (file)
--- a/WebKit/mac/Misc/WebCoreStatistics.mm
+++ b/WebKit/mac/Misc/WebCoreStatistics.mm
@@ -30,8 +30,8 @@
 
 #import "WebCache.h"
 #import "WebFrameInternal.h"
-#import <JavaScriptCore/interpreter.h>
-#import <JavaScriptCore/JSLock.h>
+#import <kjs/interpreter.h>
+#import <kjs/JSLock.h>
 #import <WebCore/FontCache.h>
 #import <WebCore/Frame.h>
 #import <WebCore/GCController.h>

diff --git a/WebKit/mac/Misc/WebDownload.m b/WebKit/mac/Misc/WebDownload.m
index cec1081..2c53c1b 100644 (file)
--- a/WebKit/mac/Misc/WebDownload.m
+++ b/WebKit/mac/Misc/WebDownload.m
@@ -30,8 +30,8 @@
 
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLDownload.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebPanelAuthenticationHandler.h>
+#import <wtf/Assertions.h>
 
 #import "WebTypesInternal.h"
 

diff --git a/WebKit/mac/Misc/WebGraphicsExtras.c b/WebKit/mac/Misc/WebGraphicsExtras.c
index 0832c6c..4d36b58 100644 (file)
--- a/WebKit/mac/Misc/WebGraphicsExtras.c
+++ b/WebKit/mac/Misc/WebGraphicsExtras.c
@@ -29,8 +29,8 @@
 #import "WebGraphicsExtras.h"
 
 #import <Accelerate/Accelerate.h>
-#import <JavaScriptCore/Assertions.h>
 #import <dlfcn.h>
+#import <wtf/Assertions.h>
 
 unsigned WebConvertBGRAToARGB(unsigned char *offscreenBuffer, int rowBytes, int x, int y, int width, int height)
 {

diff --git a/WebKit/mac/Misc/WebKitLogging.h b/WebKit/mac/Misc/WebKitLogging.h
index 0bf791c..dc37dbf 100644 (file)
--- a/WebKit/mac/Misc/WebKitLogging.h
+++ b/WebKit/mac/Misc/WebKitLogging.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 #ifndef LOG_CHANNEL_PREFIX
 #define LOG_CHANNEL_PREFIX WebKitLog

diff --git a/WebKit/mac/Misc/WebKitSystemBits.m b/WebKit/mac/Misc/WebKitSystemBits.m
index afa54f2..6825bc4 100644 (file)
--- a/WebKit/mac/Misc/WebKitSystemBits.m
+++ b/WebKit/mac/Misc/WebKitSystemBits.m
@@ -28,7 +28,7 @@
 
 #import <WebKit/WebKitSystemBits.h>
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 #include <mach/mach.h>
 #include <mach/host_info.h>

diff --git a/WebKit/mac/Misc/WebLocalizableStrings.m b/WebKit/mac/Misc/WebLocalizableStrings.m
index 6e95be1..0babfbc 100644 (file)
--- a/WebKit/mac/Misc/WebLocalizableStrings.m
+++ b/WebKit/mac/Misc/WebLocalizableStrings.m
@@ -28,7 +28,7 @@
 
 #import <WebKit/WebLocalizableStrings.h>
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 WebLocalizableStringsBundle WebKitLocalizableStringsBundle = { "com.apple.WebKit", 0 };
 

diff --git a/WebKit/mac/Misc/WebNSArrayExtras.m b/WebKit/mac/Misc/WebNSArrayExtras.m
index efc655e..b8b9af3 100644 (file)
--- a/WebKit/mac/Misc/WebNSArrayExtras.m
+++ b/WebKit/mac/Misc/WebNSArrayExtras.m
@@ -28,7 +28,7 @@
 
 #import "WebNSArrayExtras.h"
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 @implementation NSMutableArray (WebExtras)
 

diff --git a/WebKit/mac/Misc/WebNSDataExtras.m b/WebKit/mac/Misc/WebNSDataExtras.m
index a10efcd..0bd4555 100644 (file)
--- a/WebKit/mac/Misc/WebNSDataExtras.m
+++ b/WebKit/mac/Misc/WebNSDataExtras.m
@@ -29,7 +29,7 @@
 #import <WebKit/WebNSDataExtras.h>
 #import <WebKit/WebNSDataExtrasPrivate.h>
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 @interface NSString (WebNSDataExtrasInternal)
 - (NSString *)_web_capitalizeRFC822HeaderFieldName;

diff --git a/WebKit/mac/Misc/WebNSDictionaryExtras.m b/WebKit/mac/Misc/WebNSDictionaryExtras.m
index 86df63a..665db22 100644 (file)
--- a/WebKit/mac/Misc/WebNSDictionaryExtras.m
+++ b/WebKit/mac/Misc/WebNSDictionaryExtras.m
@@ -28,7 +28,7 @@
 
 #import <WebKit/WebNSDataExtras.h>
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 @implementation NSDictionary (WebNSDictionaryExtras)
 -(NSNumber *)_webkit_numberForKey:(id)key

diff --git a/WebKit/mac/Misc/WebNSFileManagerExtras.m b/WebKit/mac/Misc/WebNSFileManagerExtras.m
index ae45afe..7e8413f 100644 (file)
--- a/WebKit/mac/Misc/WebNSFileManagerExtras.m
+++ b/WebKit/mac/Misc/WebNSFileManagerExtras.m
@@ -28,9 +28,9 @@
 
 #import <WebKit/WebNSFileManagerExtras.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebKitNSStringExtras.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 #import <sys/mount.h>
 

diff --git a/WebKit/mac/Misc/WebNSPasteboardExtras.mm b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
index 64e7cb6..b84542a 100644 (file)
--- a/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+++ b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
@@ -35,12 +35,12 @@
 #import "WebResourcePrivate.h"
 #import "WebURLsWithTitles.h"
 #import "WebViewPrivate.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/Element.h>
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/RenderImage.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>
+#import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
 #import <WebKitSystemInterface.h>
 

diff --git a/WebKit/mac/Misc/WebNSURLExtras.mm b/WebKit/mac/Misc/WebNSURLExtras.mm
index 68a885a..b388c22 100644 (file)
--- a/WebKit/mac/Misc/WebNSURLExtras.mm
+++ b/WebKit/mac/Misc/WebNSURLExtras.mm
@@ -35,10 +35,10 @@
 #import "WebNSObjectExtras.h"
 #import "WebSystemInterface.h"
 #import <Foundation/NSURLRequest.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/KURL.h>
 #import <WebCore/LoaderNSURLExtras.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 #import <unicode/uchar.h>
 #import <unicode/uidna.h>
 #import <unicode/uscript.h>

diff --git a/WebKit/mac/Misc/WebNSUserDefaultsExtras.m b/WebKit/mac/Misc/WebNSUserDefaultsExtras.m
index b7d297a..0d3cc30 100644 (file)
--- a/WebKit/mac/Misc/WebNSUserDefaultsExtras.m
+++ b/WebKit/mac/Misc/WebNSUserDefaultsExtras.m
@@ -28,8 +28,8 @@
 
 #import <WebKit/WebNSUserDefaultsExtras.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 @implementation NSString (WebNSUserDefaultsPrivate)
 

diff --git a/WebKit/mac/Panels/WebAuthenticationPanel.m b/WebKit/mac/Panels/WebAuthenticationPanel.m
index c20dfa7..4e17536 100644 (file)
--- a/WebKit/mac/Panels/WebAuthenticationPanel.m
+++ b/WebKit/mac/Panels/WebAuthenticationPanel.m
@@ -31,9 +31,9 @@
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLProtectionSpace.h>
 #import <Foundation/NSURLCredential.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebLocalizableStrings.h>
 #import <WebKit/WebNSURLExtras.h>
+#import <wtf/Assertions.h>
 
 #import <WebKit/WebNSControlExtras.h>
 

diff --git a/WebKit/mac/Panels/WebPanelAuthenticationHandler.m b/WebKit/mac/Panels/WebPanelAuthenticationHandler.m
index f21b9c7..c4c6e5b 100644 (file)
--- a/WebKit/mac/Panels/WebPanelAuthenticationHandler.m
+++ b/WebKit/mac/Panels/WebPanelAuthenticationHandler.m
@@ -30,8 +30,8 @@
 
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <WebKit/WebAuthenticationPanel.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebNSDictionaryExtras.h>
+#import <wtf/Assertions.h>
 
 static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
 

diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 8e93faa..9b7747f 100644 (file)
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -52,8 +52,7 @@
 #import "WebViewInternal.h"
 #import "WebUIDelegatePrivate.h"
 #import <Carbon/Carbon.h>
-#import <JavaScriptCore/Assertions.h>
-#import <JavaScriptCore/JSLock.h>
+#import <kjs/JSLock.h>
 #import <WebCore/npruntime_impl.h>
 #import <WebCore/Document.h>
 #import <WebCore/Element.h>
@@ -67,6 +66,7 @@
 #import <WebKit/nptextinput.h>
 #import <WebKit/DOMPrivate.h>
 #import <WebKit/WebUIDelegate.h>
+#import <wtf/Assertions.h>
 #import <objc/objc-runtime.h>
 
 using namespace WebCore;

diff --git a/WebKit/mac/Plugins/WebBasePluginPackage.m b/WebKit/mac/Plugins/WebBasePluginPackage.m
index 4346cc4..03d438b 100644 (file)
--- a/WebKit/mac/Plugins/WebBasePluginPackage.m
+++ b/WebKit/mac/Plugins/WebBasePluginPackage.m
@@ -28,13 +28,13 @@
 
 #import <WebKit/WebBasePluginPackage.h>
 
-#import <JavaScriptCore/Assertions.h>
-#import <JavaScriptCore/Vector.h>
 #import <WebKit/WebKitNSStringExtras.h>
 #import <WebKit/WebNetscapePluginPackage.h>
 #import <WebKit/WebNSObjectExtras.h>
 #import <WebKit/WebPluginPackage.h>
 #import <WebCore/WebCoreObjCExtras.h>
+#import <wtf/Assertions.h>
+#import <wtf/Vector.h>
 
 #import <WebKitSystemInterface.h>
 

diff --git a/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm b/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm
index 5f732a2..5380853 100644 (file)
--- a/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginEmbeddedView.mm
@@ -40,9 +40,9 @@
 #import "WebNetscapePluginPackage.h"
 #import "WebNetscapePluginStream.h"
 #import "WebView.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
+#import <wtf/Assertions.h>
 
 @implementation WebNetscapePluginEmbeddedView
 

diff --git a/WebKit/mac/Plugins/WebPluginContainerCheck.mm b/WebKit/mac/Plugins/WebPluginContainerCheck.mm
index 3aa289d..3ef65aa 100644 (file)
--- a/WebKit/mac/Plugins/WebPluginContainerCheck.mm
+++ b/WebKit/mac/Plugins/WebPluginContainerCheck.mm
@@ -37,10 +37,10 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSURLRequest.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderTypes.h>
+#import <wtf/Assertions.h>
 #import <objc/objc-runtime.h>
 
 using namespace WebCore;

diff --git a/WebKit/mac/Plugins/WebPluginController.mm b/WebKit/mac/Plugins/WebPluginController.mm
index 5afeffa..ff112ad 100644 (file)
--- a/WebKit/mac/Plugins/WebPluginController.mm
+++ b/WebKit/mac/Plugins/WebPluginController.mm
@@ -29,8 +29,8 @@
 
 #import <WebKit/WebPluginController.h>
 
-#import <JavaScriptCore/JSLock.h>
 #import <Foundation/NSURLRequest.h>
+#import <kjs/JSLock.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/ResourceRequest.h>

diff --git a/WebKit/mac/Plugins/WebPluginDatabase.mm b/WebKit/mac/Plugins/WebPluginDatabase.mm
index 3aea557..3d384a6 100644 (file)
--- a/WebKit/mac/Plugins/WebPluginDatabase.mm
+++ b/WebKit/mac/Plugins/WebPluginDatabase.mm
@@ -28,7 +28,6 @@
 
 #import <WebKit/WebPluginDatabase.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebBasePluginPackage.h>
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebFrame.h>
@@ -43,6 +42,7 @@
 #import <WebKit/WebViewPrivate.h>
 #import <Webkit/WebHTMLView.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 static void checkCandidate(WebBasePluginPackage **currentPlugin, WebBasePluginPackage **candidatePlugin);
 

diff --git a/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m b/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
index 573dc84..bd1a601 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
+++ b/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
@@ -28,7 +28,7 @@
 
 #import "WebJavaScriptTextInputPanel.h"
 
-#import <JavaScriptCore/Assertions.h>
+#import <wtf/Assertions.h>
 
 #import <WebKit/WebNSControlExtras.h>
 #import <WebKit/WebNSWindowExtras.h>

diff --git a/WebKit/mac/WebCoreSupport/WebKeyGenerator.m b/WebKit/mac/WebCoreSupport/WebKeyGenerator.m
index 782a6f4..454175e 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebKeyGenerator.m
+++ b/WebKit/mac/WebCoreSupport/WebKeyGenerator.m
@@ -28,9 +28,9 @@
 
 #import <WebKit/WebKeyGenerator.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebLocalizableStrings.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 @implementation WebKeyGenerator
 

diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 1d862fc..346b672 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -28,7 +28,6 @@
 
 #import <WebKit/WebViewFactory.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebFrameInternal.h>
 #import <WebKit/WebViewInternal.h>
 #import <WebKit/WebHTMLViewInternal.h>
@@ -38,6 +37,7 @@
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPluginDatabase.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 @interface NSMenu (WebViewFactoryAdditions)
 - (NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action tag:(int)tag;

diff --git a/WebKit/mac/WebInspector/WebNodeHighlight.m b/WebKit/mac/WebInspector/WebNodeHighlight.m
index 26c35e6..11a8a37 100644 (file)
--- a/WebKit/mac/WebInspector/WebNodeHighlight.m
+++ b/WebKit/mac/WebInspector/WebNodeHighlight.m
@@ -30,8 +30,8 @@
 #import "WebNodeHighlightView.h"
 #import "WebNSViewExtras.h"
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/InspectorController.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 

diff --git a/WebKit/mac/WebInspector/WebNodeHighlightView.m b/WebKit/mac/WebInspector/WebNodeHighlightView.m
index fb8cc77..73b13c9 100644 (file)
--- a/WebKit/mac/WebInspector/WebNodeHighlightView.m
+++ b/WebKit/mac/WebInspector/WebNodeHighlightView.m
@@ -33,9 +33,9 @@
 #import <WebKit/DOMCore.h>
 #import <WebKit/DOMExtensions.h>
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/InspectorController.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 

diff --git a/WebKit/mac/WebKitPrefix.h b/WebKit/mac/WebKitPrefix.h
index b44f95e..c1044d7 100644 (file)
--- a/WebKit/mac/WebKitPrefix.h
+++ b/WebKit/mac/WebKitPrefix.h
@@ -66,7 +66,7 @@
 #endif
 #endif
 
-#include <JavaScriptCore/Platform.h>
+#include <wtf/Platform.h>
 
 #ifdef __cplusplus
 #include <wtf/FastMalloc.h>

diff --git a/WebKit/mac/WebView/WebClipView.m b/WebKit/mac/WebView/WebClipView.m
index cb2dede..b551145 100644 (file)
--- a/WebKit/mac/WebView/WebClipView.m
+++ b/WebKit/mac/WebView/WebClipView.m
@@ -28,10 +28,10 @@
 
 #import "WebClipView.h"
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebHTMLView.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebViewPrivate.h>
+#import <wtf/Assertions.h>
 
 // WebClipView's entire reason for existing is to set the clip used by focus ring redrawing.
 // There's no easy way to prevent the focus ring from drawing outside the passed-in clip rectangle

diff --git a/WebKit/mac/WebView/WebDataSource.mm b/WebKit/mac/WebView/WebDataSource.mm
index 7f7bd56..d9ced0b 100644 (file)
--- a/WebKit/mac/WebView/WebDataSource.mm
+++ b/WebKit/mac/WebView/WebDataSource.mm
@@ -47,7 +47,6 @@
 #import "WebResourceLoadDelegate.h"
 #import "WebResourcePrivate.h"
 #import "WebViewInternal.h"
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/KURL.h>
 #import <WebCore/LegacyWebArchive.h>
@@ -58,6 +57,7 @@
 #import <WebCore/WebCoreURLResponse.h>
 #import <WebKit/DOMHTML.h>
 #import <WebKit/DOMPrivate.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 

diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 9fc82dc..7a60a6f 100644 (file)
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -49,7 +49,6 @@
 #import "WebScriptDebugger.h"
 #import "WebViewInternal.h"
 #import <JavaScriptCore/APICast.h>
-#import <JavaScriptCore/JSLock.h>
 #import <WebCore/AccessibilityObject.h>
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/ColorMac.h>
@@ -77,6 +76,7 @@
 #import <WebCore/ScriptController.h>
 #import <WebCore/markup.h>
 #import <WebCore/visible_units.h>
+#import <kjs/JSLock.h>
 
 using namespace std;
 using namespace WebCore;

diff --git a/WebKit/mac/WebView/WebFrameView.mm b/WebKit/mac/WebView/WebFrameView.mm
index 9503626..4929cd9 100644 (file)
--- a/WebKit/mac/WebView/WebFrameView.mm
+++ b/WebKit/mac/WebView/WebFrameView.mm
@@ -54,7 +54,6 @@
 #import "WebViewInternal.h"
 #import "WebViewPrivate.h"
 #import <Foundation/NSURLRequest.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/DragController.h>
 #import <WebCore/EventHandler.h>
 #import <WebCore/Frame.h>
@@ -66,6 +65,7 @@
 #import <WebCore/WebCoreFrameView.h>
 #import <WebCore/WebCoreView.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 

diff --git a/WebKit/mac/WebView/WebHTMLRepresentation.mm b/WebKit/mac/WebView/WebHTMLRepresentation.mm
index a436990..540c1f8 100644 (file)
--- a/WebKit/mac/WebView/WebHTMLRepresentation.mm
+++ b/WebKit/mac/WebView/WebHTMLRepresentation.mm
@@ -42,7 +42,6 @@
 #import "WebResourcePrivate.h"
 #import "WebView.h"
 #import <Foundation/NSURLResponse.h>
-#import <JavaScriptCore/Assertions.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
@@ -54,6 +53,7 @@
 #import <WebCore/Range.h>
 #import <WebCore/TextResourceDecoder.h>
 #import <WebKit/DOMHTMLInputElement.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 using namespace HTMLNames;

diff --git a/WebKit/mac/WebView/WebPDFRepresentation.m b/WebKit/mac/WebView/WebPDFRepresentation.m
index beba1fa..1a2ddab 100644 (file)
--- a/WebKit/mac/WebView/WebPDFRepresentation.m
+++ b/WebKit/mac/WebView/WebPDFRepresentation.m
@@ -26,13 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <JavaScriptCore/Assertions.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebFrame.h>
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebNSObjectExtras.h>
 #import <WebKit/WebPDFRepresentation.h>
 #import <WebKit/WebPDFView.h>
+#import <wtf/Assertions.h>
 
 #import <PDFKit/PDFDocument.h>
 

diff --git a/WebKit/mac/WebView/WebPDFView.mm b/WebKit/mac/WebView/WebPDFView.mm
index 74ed503..eb1f6c0 100644 (file)
--- a/WebKit/mac/WebView/WebPDFView.mm
+++ b/WebKit/mac/WebView/WebPDFView.mm
@@ -45,7 +45,6 @@
 #import "WebUIDelegatePrivate.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
-#import <JavaScriptCore/Assertions.h>
 #import <PDFKit/PDFKit.h>
 #import <WebCore/EventNames.h>
 #import <WebCore/Frame.h>
@@ -54,6 +53,7 @@
 #import <WebCore/KeyboardEvent.h>
 #import <WebCore/MouseEvent.h>
 #import <WebCore/PlatformKeyboardEvent.h>
+#import <wtf/Assertions.h>
 
 using namespace WebCore;
 using namespace EventNames;

diff --git a/WebKit/mac/WebView/WebScriptDebugDelegate.mm b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
index 9218d45..6e3be44 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugDelegate.mm
+++ b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
@@ -32,12 +32,12 @@
 #import "WebFrameInternal.h"
 #import "WebScriptDebugDelegate.h"
 #import "WebViewInternal.h"
-#import <JavaScriptCore/DebuggerCallFrame.h>
-#import <JavaScriptCore/ExecState.h>
-#import <JavaScriptCore/JSGlobalObject.h>
-#import <JavaScriptCore/JSFunction.h>
-#import <JavaScriptCore/JSLock.h>
-#import <JavaScriptCore/interpreter.h>
+#import <kjs/DebuggerCallFrame.h>
+#import <kjs/ExecState.h>
+#import <kjs/JSGlobalObject.h>
+#import <kjs/JSFunction.h>
+#import <kjs/JSLock.h>
+#import <kjs/interpreter.h>
 #import <WebCore/Frame.h>
 #import <WebCore/WebScriptObjectPrivate.h>
 #import <WebCore/ScriptController.h>

diff --git a/WebKit/mac/WebView/WebScriptDebugger.h b/WebKit/mac/WebView/WebScriptDebugger.h
index e28a2df..5504dab 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugger.h
+++ b/WebKit/mac/WebView/WebScriptDebugger.h
@@ -29,7 +29,7 @@
 #ifndef WebScriptDebugger_h
 #define WebScriptDebugger_h
 
-#include <JavaScriptCore/debugger.h>
+#include <kjs/debugger.h>
 
 #include <wtf/RetainPtr.h>
 

diff --git a/WebKit/mac/WebView/WebScriptDebugger.mm b/WebKit/mac/WebView/WebScriptDebugger.mm
index cb7de05..c915713 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugger.mm
+++ b/WebKit/mac/WebView/WebScriptDebugger.mm
@@ -31,8 +31,8 @@
 #include "WebFrameInternal.h"
 #include "WebViewInternal.h"
 #include "WebScriptDebugDelegate.h"
-#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/DebuggerCallFrame.h>
+#include <kjs/JSGlobalObject.h>
+#include <kjs/DebuggerCallFrame.h>
 #include <WebCore/DOMWindow.h>
 #include <WebCore/Frame.h>
 #include <WebCore/JSDOMWindow.h>

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index e6559a4..f8b9d3e 100644 (file)
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -88,12 +88,10 @@
 #import "WebUIDelegatePrivate.h"
 #import <CoreFoundation/CFSet.h>
 #import <Foundation/NSURLConnection.h>
-#import <JavaScriptCore/Assertions.h>
-#import <JavaScriptCore/HashTraits.h>
-#import <JavaScriptCore/RefPtr.h>
-#import <JavaScriptCore/ArrayPrototype.h>
-#import <JavaScriptCore/DateInstance.h>
-#import <JavaScriptCore/JSLock.h>
+#import <kjs/ArrayPrototype.h>
+#import <kjs/DateInstance.h>
+#import <kjs/InitializeThreading.h>
+#import <kjs/JSLock.h>
 #import <WebCore/ApplicationCacheStorage.h>
 #import <WebCore/Cache.h>
 #import <WebCore/ColorMac.h>
@@ -127,7 +125,9 @@
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>
 #import <WebKitSystemInterface.h>
-#import <kjs/InitializeThreading.h>
+#import <wtf/Assertions.h>
+#import <wtf/HashTraits.h>
+#import <wtf/RefPtr.h>
 #import <mach-o/dyld.h>
 #import <objc/objc-auto.h>
 #import <objc/objc-runtime.h>