Make Frame's ScriptController an OwnPtr and remove the #include
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 14 Apr 2013 00:54:27 +0000 (00:54 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 14 Apr 2013 00:54:27 +0000 (00:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114105

Reviewed by Dean Jackson.

Source/WebCore:

* Modules/websockets/WebSocket.cpp:
* bindings/generic/BindingSecurity.cpp:
* bindings/js/JSEventListener.cpp:
* bindings/js/JSLazyEventListener.cpp:
* bindings/js/PageScriptDebugServer.cpp:
* bindings/js/ScriptEventListener.cpp:
* bindings/js/ScriptState.cpp:
* bindings/objc/DOM.mm:
* bindings/objc/DOMAbstractView.mm:
* bindings/objc/DOMInternal.mm:
* dom/DocumentStyleSheetCollection.cpp:
* dom/EventTarget.cpp:
* dom/ScriptElement.cpp:
* history/CachedFrame.cpp:
* html/HTMLCanvasElement.cpp:
* html/HTMLDocument.cpp:
* html/HTMLElement.cpp:
* html/HTMLFormElement.cpp:
* html/HTMLPlugInElement.cpp:
* html/HTMLPlugInImageElement.cpp:
* html/parser/HTMLParserOptions.cpp:
* inspector/InspectorAgent.cpp:
* inspector/InspectorController.cpp:
* inspector/InspectorFrontendClientLocal.cpp:
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorInstrumentation.cpp:
* inspector/InspectorOverlay.cpp:
* inspector/InspectorPageAgent.cpp:
* inspector/PageRuntimeAgent.cpp:
* loader/DocumentWriter.cpp:
* loader/NavigationScheduler.cpp:
* loader/SubframeLoader.cpp:
* loader/cache/CachedResourceLoader.cpp:
* page/DOMWindow.cpp:
* page/EventSource.cpp:
* page/Frame.cpp:
* page/Frame.h:
* page/Navigator.cpp:
* page/Page.cpp:
* page/PageGroup.cpp:
* xml/XMLHttpRequest.cpp:
* xml/XMLTreeViewer.cpp:

Source/WebKit/mac:

* Plugins/Hosted/HostedNetscapePluginStream.mm:
* Plugins/WebNetscapePluginStream.mm:
* Plugins/WebPluginContainerCheck.mm:
* WebCoreSupport/WebGeolocationClient.mm:
* WebCoreSupport/WebInspectorClient.mm:
* WebView/WebFrame.mm:

Source/WebKit2:

* Shared/WebHitTestResult.cpp:
* Shared/WebHitTestResult.h:
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
* UIProcess/WebContext.h:
* UIProcess/WebPageProxy.h:
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
* WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp:
* WebProcess/Plugins/Netscape/NPJSObject.cpp:
* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/Storage/StorageAreaImpl.cpp:
* WebProcess/Storage/StorageAreaMap.cpp:
* WebProcess/WebPage/WebFrame.cpp:
* WebProcess/WebPage/WebPage.cpp:

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

88 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp
Source/WebCore/Modules/websockets/WebSocket.cpp
Source/WebCore/bindings/generic/BindingSecurity.cpp
Source/WebCore/bindings/js/JSEventListener.cpp
Source/WebCore/bindings/js/JSLazyEventListener.cpp
Source/WebCore/bindings/js/PageScriptDebugServer.cpp
Source/WebCore/bindings/js/ScriptEventListener.cpp
Source/WebCore/bindings/js/ScriptState.cpp
Source/WebCore/bindings/objc/DOM.mm
Source/WebCore/bindings/objc/DOMAbstractView.mm
Source/WebCore/bindings/objc/DOMInternal.mm
Source/WebCore/dom/Clipboard.cpp
Source/WebCore/dom/DocumentStyleSheetCollection.cpp
Source/WebCore/dom/EventTarget.cpp
Source/WebCore/dom/ScriptElement.cpp
Source/WebCore/editing/atk/FrameSelectionAtk.cpp
Source/WebCore/history/CachedFrame.cpp
Source/WebCore/html/HTMLCanvasElement.cpp
Source/WebCore/html/HTMLDocument.cpp
Source/WebCore/html/HTMLElement.cpp
Source/WebCore/html/HTMLFormElement.cpp
Source/WebCore/html/HTMLPlugInElement.cpp
Source/WebCore/html/HTMLPlugInImageElement.cpp
Source/WebCore/html/parser/HTMLParserOptions.cpp
Source/WebCore/html/parser/XSSAuditorDelegate.cpp
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
Source/WebCore/inspector/InspectorFrontendHost.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorOverlay.cpp
Source/WebCore/inspector/InspectorPageAgent.cpp
Source/WebCore/inspector/PageRuntimeAgent.cpp
Source/WebCore/loader/DocumentWriter.cpp
Source/WebCore/loader/NavigationScheduler.cpp
Source/WebCore/loader/SubframeLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/page/BarInfo.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/EventSource.cpp
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/Navigator.cpp
Source/WebCore/page/Page.cpp
Source/WebCore/page/PageGroup.cpp
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
Source/WebCore/plugins/DOMMimeTypeArray.cpp
Source/WebCore/plugins/DOMPlugin.cpp
Source/WebCore/plugins/DOMPluginArray.cpp
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/efl/PluginViewEfl.cpp
Source/WebCore/plugins/gtk/PluginViewGtk.cpp
Source/WebCore/plugins/qt/PluginViewQt.cpp
Source/WebCore/storage/Storage.cpp
Source/WebCore/xml/XMLHttpRequest.cpp
Source/WebCore/xml/XMLTreeViewer.cpp
Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm
Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm
Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/qt/Api/qwebelement.cpp
Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
Source/WebKit/qt/WidgetApi/qwebframe.cpp
Source/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebHitTestResult.cpp
Source/WebKit2/Shared/WebHitTestResult.h
Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp
Source/WebKit2/UIProcess/WebContext.h
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp
Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp
Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index e86908f..7108be9 100644 (file)
@@ -1,3 +1,53 @@
+2013-04-10  Sam Weinig  <sam@webkit.org>
+
+        Make Frame's ScriptController an OwnPtr and remove the #include
+        https://bugs.webkit.org/show_bug.cgi?id=114105
+
+        Reviewed by Dean Jackson.
+
+        * Modules/websockets/WebSocket.cpp:
+        * bindings/generic/BindingSecurity.cpp:
+        * bindings/js/JSEventListener.cpp:
+        * bindings/js/JSLazyEventListener.cpp:
+        * bindings/js/PageScriptDebugServer.cpp:
+        * bindings/js/ScriptEventListener.cpp:
+        * bindings/js/ScriptState.cpp:
+        * bindings/objc/DOM.mm:
+        * bindings/objc/DOMAbstractView.mm:
+        * bindings/objc/DOMInternal.mm:
+        * dom/DocumentStyleSheetCollection.cpp:
+        * dom/EventTarget.cpp:
+        * dom/ScriptElement.cpp:
+        * history/CachedFrame.cpp:
+        * html/HTMLCanvasElement.cpp:
+        * html/HTMLDocument.cpp:
+        * html/HTMLElement.cpp:
+        * html/HTMLFormElement.cpp:
+        * html/HTMLPlugInElement.cpp:
+        * html/HTMLPlugInImageElement.cpp:
+        * html/parser/HTMLParserOptions.cpp:
+        * inspector/InspectorAgent.cpp:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorFrontendClientLocal.cpp:
+        * inspector/InspectorFrontendHost.cpp:
+        * inspector/InspectorInstrumentation.cpp:
+        * inspector/InspectorOverlay.cpp:
+        * inspector/InspectorPageAgent.cpp:
+        * inspector/PageRuntimeAgent.cpp:
+        * loader/DocumentWriter.cpp:
+        * loader/NavigationScheduler.cpp:
+        * loader/SubframeLoader.cpp:
+        * loader/cache/CachedResourceLoader.cpp:
+        * page/DOMWindow.cpp:
+        * page/EventSource.cpp:
+        * page/Frame.cpp:
+        * page/Frame.h:
+        * page/Navigator.cpp:
+        * page/Page.cpp:
+        * page/PageGroup.cpp:
+        * xml/XMLHttpRequest.cpp:
+        * xml/XMLTreeViewer.cpp:
+
 2013-04-13  Anders Carlsson  <andersca@apple.com>
 
         Add form delegate method that's invoked right before sending a submit event to a form element
index 5834e88..e0e198e 100644 (file)
@@ -30,6 +30,7 @@
 #include "NetworkInfoConnection.h"
 
 #if ENABLE(NETWORK_INFO)
+#include "Document.h"
 #include "Event.h"
 #include "Frame.h"
 #include "NetworkInfoClient.h"
index d82d80d..3e0e891 100644 (file)
@@ -49,6 +49,7 @@
 #include "Logging.h"
 #include "MessageEvent.h"
 #include "ScriptCallStack.h"
+#include "ScriptController.h"
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 #include "ThreadableWebSocketChannel.h"
index e5144e0..2aa21dd 100644 (file)
@@ -37,6 +37,7 @@
 #include "Frame.h"
 #include "HTMLFrameElementBase.h"
 #include "HTMLParserIdioms.h"
+#include "JSDOMBinding.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 
index c97a163..60f5a70 100644 (file)
@@ -26,6 +26,7 @@
 #include "JSEvent.h"
 #include "JSEventTarget.h"
 #include "JSMainThreadExecState.h"
+#include "ScriptController.h"
 #include "WorkerContext.h"
 #include <runtime/ExceptionHelpers.h>
 #include <runtime/JSLock.h>
index 3df6644..67337ce 100644 (file)
@@ -23,6 +23,7 @@
 #include "ContentSecurityPolicy.h"
 #include "Frame.h"
 #include "JSNode.h"
+#include "ScriptController.h"
 #include <runtime/FunctionConstructor.h>
 #include <runtime/JSFunction.h>
 #include <runtime/JSLock.h>
index 568ae43..438af9c 100644 (file)
@@ -41,6 +41,7 @@
 #include "Page.h"
 #include "PageGroup.h"
 #include "PluginView.h"
+#include "ScriptController.h"
 #include "ScriptDebugListener.h"
 #include "Widget.h"
 #include <runtime/JSLock.h>
index 9157124..b74f4c9 100644 (file)
@@ -37,6 +37,7 @@
 #include "EventListener.h"
 #include "JSNode.h"
 #include "Frame.h"
+#include "ScriptController.h"
 #include <runtime/Executable.h>
 #include <runtime/JSFunction.h>
 #include <runtime/JSLock.h>
index 2c45061..77884b9 100644 (file)
@@ -35,6 +35,7 @@
 #include "JSDOMWindowBase.h"
 #include "Node.h"
 #include "Page.h"
+#include "ScriptController.h"
 #include "WorkerContext.h"
 #include "WorkerScriptController.h"
 #include <heap/StrongInlines.h>
index 6c8b18d..9de18c3 100644 (file)
@@ -46,6 +46,7 @@
 #import "JSNode.h"
 #import "NodeFilter.h"
 #import "RenderImage.h"
+#import "ScriptController.h"
 #import "WebScriptObjectPrivate.h"
 #import <JavaScriptCore/APICast.h>
 #import <wtf/HashMap.h>
index d2d3dd5..a6e54ee 100644 (file)
@@ -31,6 +31,8 @@
 #import "DOMAbstractViewInternal.h"
 
 #import "DOMDocumentInternal.h"
+#import "DOMWindow.h"
+#import "Document.h"
 #import "ExceptionHandlers.h"
 #import "Frame.h"
 #import "ThreadCheck.h"
index fab10b4..f55674d 100644 (file)
@@ -29,6 +29,7 @@
 #import "DOMNodeInternal.h"
 #import "Frame.h"
 #import "JSNode.h"
+#import "ScriptController.h"
 #import "WebScriptObjectPrivate.h"
 #import "runtime_root.h"
 
index b2c0716..35c427a 100644 (file)
@@ -30,6 +30,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "Image.h"
+#include "ScriptWrappableInlines.h"
 
 namespace WebCore {
 
index 232b5e2..10287d9 100644 (file)
@@ -29,6 +29,7 @@
 #include "DocumentStyleSheetCollection.h"
 
 #include "CSSStyleSheet.h"
+#include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "Element.h"
 #include "HTMLIFrameElement.h"
index c093ec1..2669b1a 100644 (file)
@@ -35,6 +35,7 @@
 #include "Event.h"
 #include "EventException.h"
 #include "InspectorInstrumentation.h"
+#include "ScriptController.h"
 #include "WebKitTransitionEvent.h"
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
index 7bd26bc..c505afa 100644 (file)
@@ -41,6 +41,7 @@
 #include "MIMETypeRegistry.h"
 #include "Page.h"
 #include "ScriptCallStack.h"
+#include "ScriptController.h"
 #include "ScriptRunner.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
index f28b59d..a7933c4 100644 (file)
@@ -23,6 +23,7 @@
 #if HAVE(ACCESSIBILITY)
 
 #include "AXObjectCache.h"
+#include "Document.h"
 #include "Frame.h"
 #include "WebKitAccessibleWrapperAtk.h"
 
index 4417f69..8715cc0 100644 (file)
@@ -42,6 +42,7 @@
 #include "Logging.h"
 #include "Page.h"
 #include "PageTransitionEvent.h"
+#include "ScriptController.h"
 #include "SerializedScriptValue.h"
 #include <wtf/text/CString.h>
 #include <wtf/RefCountedLeakCounter.h>
index 1c1605a..6428042 100644 (file)
@@ -45,6 +45,7 @@
 #include "MIMETypeRegistry.h"
 #include "Page.h"
 #include "RenderHTMLCanvas.h"
+#include "ScriptController.h"
 #include "Settings.h"
 #include "WebCoreMemoryInstrumentation.h"
 #include <math.h>
index d10b65c..1c1bf2a 100644 (file)
@@ -72,6 +72,7 @@
 #include "InspectorInstrumentation.h"
 #include "KURL.h"
 #include "Page.h"
+#include "ScriptController.h"
 #include "Settings.h"
 #include "StyleResolver.h"
 #include <wtf/text/CString.h>
index f25e50f..631d0ba 100644 (file)
@@ -49,6 +49,7 @@
 #include "HTMLTextFormControlElement.h"
 #include "NodeTraversal.h"
 #include "RenderWordBreak.h"
+#include "ScriptController.h"
 #include "ScriptEventListener.h"
 #include "Settings.h"
 #include "StylePropertySet.h"
index 8a88cc1..c0f534e 100644 (file)
@@ -51,6 +51,7 @@
 #include "NodeTraversal.h"
 #include "Page.h"
 #include "RenderTextControl.h"
+#include "ScriptController.h"
 #include "ScriptEventListener.h"
 #include "Settings.h"
 #include "ValidityState.h"
index ebab7ca..9f91d93 100644 (file)
@@ -38,6 +38,7 @@
 #include "RenderEmbeddedObject.h"
 #include "RenderSnapshottedPlugIn.h"
 #include "RenderWidget.h"
+#include "ScriptController.h"
 #include "Settings.h"
 #include "Widget.h"
 #include <wtf/UnusedParam.h>
index 4e8eeb0..9baf002 100644 (file)
@@ -43,6 +43,7 @@
 #include "RenderImage.h"
 #include "RenderSnapshottedPlugIn.h"
 #include "SchemeRegistry.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
index 8f6a6b0..07eb5c0 100644 (file)
@@ -29,6 +29,7 @@
 #include "Document.h"
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "ScriptController.h"
 #include "Settings.h"
 
 namespace WebCore {
index 67b81e8..3678a54 100644 (file)
@@ -38,6 +38,7 @@
 #include "InspectorValues.h"
 #include "PingLoader.h"
 #include "SecurityOrigin.h"
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
index 2149334..83a1693 100644 (file)
@@ -48,6 +48,7 @@
 #include "InstrumentingAgents.h"
 #include "Page.h"
 #include "ResourceRequest.h"
+#include "ScriptController.h"
 #include "ScriptFunctionCall.h"
 #include "ScriptObject.h"
 #include "SecurityOrigin.h"
index 93a0925..4bb09d9 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "InspectorController.h"
 
+#include "DOMWrapperWorld.h"
 #include "Frame.h"
 #include "GraphicsContext.h"
 #include "IdentifiersFactory.h"
index e5e28c2..02207ec 100644 (file)
@@ -35,6 +35,7 @@
 #include "InspectorFrontendClientLocal.h"
 
 #include "Chrome.h"
+#include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "FloatRect.h"
 #include "Frame.h"
@@ -46,6 +47,7 @@
 #include "InspectorFrontendHost.h"
 #include "InspectorPageAgent.h"
 #include "Page.h"
+#include "ScriptController.h"
 #include "ScriptFunctionCall.h"
 #include "ScriptObject.h"
 #include "ScriptState.h"
index 5d39b99..6ed7a88 100644 (file)
@@ -38,6 +38,7 @@
 #include "ContextMenuController.h"
 #include "ContextMenuProvider.h"
 #include "DOMFileSystem.h"
+#include "DOMWrapperWorld.h"
 #include "Element.h"
 #include "Frame.h"
 #include "FrameLoader.h"
index 496729e..b49444a 100644 (file)
@@ -39,6 +39,7 @@
 #include "ConsoleAPITypes.h"
 #include "ConsoleTypes.h"
 #include "DOMWindow.h"
+#include "DOMWrapperWorld.h"
 #include "Database.h"
 #include "DeviceOrientationData.h"
 #include "DocumentLoader.h"
 #include "EventContext.h"
 #include "InspectorAgent.h"
 #include "InspectorApplicationCacheAgent.h"
-#include "InspectorDOMDebuggerAgent.h"
 #include "InspectorCSSAgent.h"
 #include "InspectorCanvasAgent.h"
 #include "InspectorConsoleAgent.h"
 #include "InspectorController.h"
-#include "WorkerInspectorController.h"
-#include "InspectorDatabaseAgent.h"
 #include "InspectorDOMAgent.h"
+#include "InspectorDOMDebuggerAgent.h"
 #include "InspectorDOMStorageAgent.h"
+#include "InspectorDatabaseAgent.h"
 #include "InspectorDebuggerAgent.h"
 #include "InspectorHeapProfilerAgent.h"
 #include "InspectorLayerTreeAgent.h"
 #include "RenderObject.h"
 #include "ScriptArguments.h"
 #include "ScriptCallStack.h"
+#include "ScriptController.h"
 #include "ScriptProfile.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
 #include "WorkerContext.h"
+#include "WorkerInspectorController.h"
 #include "WorkerRuntimeAgent.h"
 #include "WorkerThread.h"
 #include "XMLHttpRequest.h"
index c5c57bf..45b7288 100644 (file)
@@ -46,6 +46,7 @@
 #include "RenderBoxModelObject.h"
 #include "RenderInline.h"
 #include "RenderObject.h"
+#include "ScriptController.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "Settings.h"
index 388f055..09405c4 100644 (file)
@@ -45,6 +45,7 @@
 #include "CookieJar.h"
 #include "DOMImplementation.h"
 #include "DOMPatchSupport.h"
+#include "DOMWrapperWorld.h"
 #include "DeviceOrientationController.h"
 #include "Document.h"
 #include "DocumentLoader.h"
@@ -69,6 +70,7 @@
 #include "Page.h"
 #include "RegularExpression.h"
 #include "ResourceBuffer.h"
+#include "ScriptController.h"
 #include "ScriptObject.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index a8431ba..ac5f8b5 100644 (file)
@@ -42,6 +42,7 @@
 #include "InstrumentingAgents.h"
 #include "Page.h"
 #include "PageConsole.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 
 using WebCore::TypeBuilder::Runtime::ExecutionContextDescription;
index 03b5749..fd94821 100644 (file)
@@ -39,6 +39,7 @@
 #include "PlaceholderDocument.h"
 #include "PluginDocument.h"
 #include "RawDataDocumentParser.h"
+#include "ScriptController.h"
 #include "ScriptableDocumentParser.h"
 #include "SecurityOrigin.h"
 #include "SegmentedString.h"
@@ -46,7 +47,6 @@
 #include "SinkDocument.h"
 #include "TextResourceDecoder.h"
 
-
 namespace WebCore {
 
 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame* parentFrame) 
index c7f255a..28cbd76 100644 (file)
@@ -47,6 +47,7 @@
 #include "HistoryItem.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
+#include "ScriptController.h"
 #include "UserGestureIndicator.h"
 #include <wtf/CurrentTime.h>
 
index 8c8eccc..ac161c3 100644 (file)
@@ -50,6 +50,7 @@
 #include "PluginDocument.h"
 #include "RenderEmbeddedObject.h"
 #include "RenderView.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
 #include "Settings.h"
index 3366455..42aff3c 100644 (file)
@@ -51,6 +51,7 @@
 #include "PingLoader.h"
 #include "PlatformStrategies.h"
 #include "ResourceLoadScheduler.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include <wtf/MemoryInstrumentationHashMap.h>
index 36b2ad6..744e498 100644 (file)
@@ -32,6 +32,7 @@
 #include "Chrome.h"
 #include "Frame.h"
 #include "Page.h"
+#include "ScriptWrappableInlines.h"
 
 namespace WebCore {
 
index cd04730..d5850fa 100644 (file)
@@ -85,6 +85,7 @@
 #include "Screen.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
 #include "SerializedScriptValue.h"
index 6e8da92..1b94347 100644 (file)
@@ -47,6 +47,7 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptCallStack.h"
+#include "ScriptController.h"
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 #include "SerializedScriptValue.h"
index f00ae70..f112c78 100644 (file)
@@ -151,7 +151,7 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
     , m_loader(this, frameLoaderClient)
     , m_navigationScheduler(this)
     , m_ownerElement(ownerElement)
-    , m_script(this)
+    , m_script(adoptPtr(new ScriptController(this)))
     , m_editor(this)
     , m_selection(this)
     , m_eventHandler(this)
@@ -294,7 +294,7 @@ void Frame::setDocument(PassRefPtr<Document> newDoc)
         m_doc->attach();
 
     if (m_doc) {
-        m_script.updateDocument();
+        m_script->updateDocument();
         m_doc->updateViewportArguments();
     }
 
@@ -586,7 +586,7 @@ void Frame::injectUserScriptsForWorld(DOMWrapperWorld* world, const UserScriptVe
             continue;
 
         if (script->injectionTime() == injectionTime && UserContentURLPattern::matchesPatterns(doc->url(), script->whitelist(), script->blacklist()))
-            m_script.evaluateInWorld(ScriptSourceCode(script->source(), script->url()), world);
+            m_script->evaluateInWorld(ScriptSourceCode(script->source(), script->url()), world);
     }
 }
 
index 3d909b5..6d66f64 100644 (file)
@@ -37,7 +37,6 @@
 #include "FrameSelection.h"
 #include "FrameTree.h"
 #include "NavigationScheduler.h"
-#include "ScriptController.h"
 #include "UserScriptTypes.h"
 
 #if PLATFORM(WIN)
@@ -69,6 +68,7 @@ namespace WebCore {
     class RegularExpression;
     class RenderPart;
     class TiledBackingStore;
+    class ScriptController;
 
 #if !USE(TILED_BACKING_STORE)
     class TiledBackingStoreClient { };
@@ -223,7 +223,7 @@ namespace WebCore {
         RefPtr<FrameView> m_view;
         RefPtr<Document> m_doc;
 
-        ScriptController m_script;
+        OwnPtr<ScriptController> m_script;
 
         mutable Editor m_editor;
         mutable FrameSelection m_selection;
@@ -283,7 +283,7 @@ namespace WebCore {
 
     inline ScriptController* Frame::script()
     {
-        return &m_script;
+        return m_script.get();
     }
 
     inline Document* Frame::document() const
index 7bf2b5b..84269ef 100644 (file)
@@ -34,6 +34,7 @@
 #include "Language.h"
 #include "Page.h"
 #include "PluginData.h"
+#include "ScriptController.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
 #include "StorageNamespace.h"
index 8731365..3703a39 100644 (file)
@@ -68,6 +68,7 @@
 #include "RenderWidget.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
+#include "ScriptController.h"
 #include "ScrollingCoordinator.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
index f68ab63..e6ebeca 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "DocumentStyleSheetCollection.h"
 #include "Frame.h"
index ca96c37..cb31dba 100644 (file)
@@ -49,6 +49,8 @@
 #import <wtf/Uint8Array.h>
 #import <wtf/Uint16Array.h>
 #import <wtf/Uint32Array.h>
+#import <wtf/CurrentTime.h>
+#import <wtf/text/CString.h>
 
 #import <AVFoundation/AVFoundation.h>
 #import <CoreMedia/CoreMedia.h>
index d39e9f1..a90c79c 100644 (file)
@@ -24,6 +24,7 @@
 #include "Frame.h"
 #include "Page.h"
 #include "PluginData.h"
+#include "ScriptWrappableInlines.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
index ef5ab4c..5c62438 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "PluginData.h"
 #include "Frame.h"
+#include "ScriptWrappableInlines.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
index c8a53a5..b9c4c0d 100644 (file)
@@ -24,6 +24,7 @@
 #include "Frame.h"
 #include "Page.h"
 #include "PluginData.h"
+#include "ScriptWrappableInlines.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
index 864b3f3..dac717f 100644 (file)
@@ -60,6 +60,7 @@
 #include "ProxyServer.h"
 #include "RenderBox.h"
 #include "RenderObject.h"
+#include "ScriptController.h"
 #include "ScriptValue.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index 2caa84d..ae87bfd 100644 (file)
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "HostWindow.h"
+#include "JSDOMWindowBase.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "PluginPackage.h"
+#include "ScriptController.h"
 #include "npruntime_impl.h"
 #include "runtime/JSLock.h"
 #include "runtime/Operations.h"
index 646d0d8..35bcb72 100644 (file)
 #include "DocumentLoader.h"
 #include "Element.h"
 #include "FocusController.h"
-#include "FrameLoader.h"
+#include "Frame.h"
 #include "FrameLoadRequest.h"
+#include "FrameLoader.h"
 #include "FrameTree.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "GRefPtrGtk.h"
 #include "GraphicsContext.h"
@@ -46,6 +46,8 @@
 #include "HTMLPlugInElement.h"
 #include "HostWindow.h"
 #include "Image.h"
+#include "JSDOMBinding.h"
+#include "JSDOMWindowBase.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
@@ -59,7 +61,6 @@
 #include "RenderObject.h"
 #include "Settings.h"
 #include "SpatialNavigation.h"
-#include "JSDOMBinding.h"
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include <runtime/JSCJSValue.h>
index e64c914..6feabae 100644 (file)
@@ -48,6 +48,7 @@
 #include "IFrameShimSupport.h"
 #include "Image.h"
 #include "JSDOMBinding.h"
+#include "JSDOMWindowBase.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
index 793a836..cb79f24 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "Frame.h"
 #include "Page.h"
+#include "ScriptWrappableInlines.h"
 #include "Settings.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
index 8cb46a1..392a886 100644 (file)
@@ -47,6 +47,7 @@
 #include "ResourceError.h"
 #include "ResourceRequest.h"
 #include "ScriptCallStack.h"
+#include "ScriptController.h"
 #include "ScriptProfile.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index b605d87..d52e811 100644 (file)
@@ -36,6 +36,7 @@
 #include "ExceptionCodePlaceholder.h"
 #include "Frame.h"
 #include "Page.h"
+#include "ScriptController.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "Settings.h"
index c90dd50..ad83b09 100644 (file)
@@ -22,6 +22,7 @@
 #include "webkitviewportattributes.h"
 
 #include "Chrome.h"
+#include "Document.h"
 #include "Frame.h"
 #include "Page.h"
 #include "webkitglobalsprivate.h"
index b271247..7781700 100644 (file)
@@ -82,6 +82,7 @@
 #include "RenderView.h"
 #include "ResourceHandle.h"
 #include "RuntimeEnabledFeatures.h"
+#include "ScriptController.h"
 #include "ScriptValue.h"
 #include "Settings.h"
 #include "WebKitDOMDocumentPrivate.h"
index bae0ae5..4720531 100644 (file)
@@ -1,3 +1,17 @@
+2013-04-10  Sam Weinig  <sam@webkit.org>
+
+        Make Frame's ScriptController an OwnPtr and remove the #include
+        https://bugs.webkit.org/show_bug.cgi?id=114105
+
+        Reviewed by Dean Jackson.
+
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        * Plugins/WebNetscapePluginStream.mm:
+        * Plugins/WebPluginContainerCheck.mm:
+        * WebCoreSupport/WebGeolocationClient.mm:
+        * WebCoreSupport/WebInspectorClient.mm:
+        * WebView/WebFrame.mm:
+
 2013-04-13  Anders Carlsson  <andersca@apple.com>
 
         Add form delegate method that's invoked right before sending a submit event to a form element
index e2e5f54..f0f0aa2 100644 (file)
@@ -36,6 +36,7 @@
 #import "WebKitSystemInterface.h"
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
+#import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
index 7bba566..db52db8 100644 (file)
@@ -29,7 +29,6 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #import "WebNetscapePluginStream.h"
 
-#import "WebNetscapePluginView.h"
 #import "WebFrameInternal.h"
 #import "WebKitErrorsPrivate.h"
 #import "WebKitLogging.h"
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebNetscapePluginPackage.h"
+#import "WebNetscapePluginView.h"
 #import <Foundation/NSURLResponse.h>
-#import <runtime/JSLock.h>
+#import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
+#import <WebCore/JSDOMWindowBase.h>
 #import <WebCore/ResourceLoadScheduler.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
 #import <WebKitSystemInterface.h>
+#import <runtime/JSLock.h>
 #import <wtf/HashMap.h>
 #import <wtf/StdLibExtras.h>
 
index 67c93d2..26bed7a 100644 (file)
@@ -37,6 +37,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSURLRequest.h>
+#import <WebCore/Document.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderTypes.h>
index ed0f9e8..27e5bab 100644 (file)
@@ -34,6 +34,7 @@
 #import "WebUIDelegatePrivate.h"
 #import "WebViewInternal.h"
 #import <WebCore/BlockExceptions.h>
+#import <WebCore/Document.h>
 #import <WebCore/Frame.h>
 #import <WebCore/Geolocation.h>
 
index 4367ae2..c8f3201 100644 (file)
@@ -47,6 +47,7 @@
 #import <WebCore/InspectorController.h>
 #import <WebCore/InspectorFrontendClient.h>
 #import <WebCore/Page.h>
+#import <WebCore/ScriptController.h>
 #import <WebCore/ScriptValue.h>
 #import <WebCore/SoftLinking.h>
 #import <WebKit/DOMExtensions.h>
index 05bd58c..06a6584 100644 (file)
@@ -87,6 +87,7 @@
 #import <WebCore/RenderPart.h>
 #import <WebCore/RenderView.h>
 #import <WebCore/RuntimeApplicationChecks.h>
+#import <WebCore/ScriptController.h>
 #import <WebCore/ScriptValue.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SmartReplace.h>
index bcede99..1974d4c 100644 (file)
@@ -44,6 +44,7 @@
 #include "qt_runtime.h"
 #include "NodeList.h"
 #include "RenderImage.h"
+#include "ScriptController.h"
 #include "ScriptState.h"
 #include "StaticNodeList.h"
 #include "StyleResolver.h"
index 031c787..16ee70c 100644 (file)
@@ -42,6 +42,7 @@
 #include "Page.h"
 #include "QWebPageAdapter.h"
 #include "RenderObject.h"
+#include "ScriptController.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "SubstituteData.h"
index 91e8b4d..f3e563c 100644 (file)
@@ -29,6 +29,7 @@
 #include "qwebscriptworld.h"
 #include "qwebscriptworld_p.h"
 #include "qwebsecurityorigin.h"
+#include "DOMWrapperWorld.h"
 #include <QMultiMap>
 #include <qdebug.h>
 #include <qevent.h>
index 41bcb48..0e9a39f 100644 (file)
@@ -32,6 +32,7 @@
 #include "WebGeolocationPosition.h"
 #include "WebSecurityOrigin.h"
 #include "WebView.h"
+#include <WebCore/Document.h>
 #include <WebCore/Frame.h>
 #include <WebCore/Geolocation.h>
 #include <WebCore/SecurityOrigin.h>
index bfb1f2a..03c0a15 100644 (file)
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/RuntimeEnabledFeatures.h>
 #include <WebCore/SchemeRegistry.h>
+#include <WebCore/ScriptController.h>
 #include <WebCore/ScriptValue.h>
 #include <WebCore/Scrollbar.h>
 #include <WebCore/ScrollbarTheme.h>
index ba6bb39..6304372 100644 (file)
@@ -1,3 +1,26 @@
+2013-04-12  Sam Weinig  <sam@webkit.org>
+
+        Make Frame's ScriptController an OwnPtr and remove the #include
+        https://bugs.webkit.org/show_bug.cgi?id=114105
+
+        Reviewed by Dean Jackson.
+
+        * Shared/WebHitTestResult.cpp:
+        * Shared/WebHitTestResult.h:
+        * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+        * UIProcess/WebContext.h:
+        * UIProcess/WebPageProxy.h:
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        * WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp:
+        * WebProcess/Plugins/Netscape/NPJSObject.cpp:
+        * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+        * WebProcess/Plugins/PDF/PDFPlugin.h:
+        * WebProcess/Plugins/PluginView.cpp:
+        * WebProcess/Storage/StorageAreaImpl.cpp:
+        * WebProcess/Storage/StorageAreaMap.cpp:
+        * WebProcess/WebPage/WebFrame.cpp:
+        * WebProcess/WebPage/WebPage.cpp:
+
 2013-04-13  Zan Dobersek  <zdobersek@igalia.com>
 
         Unreviewed GTK build fix after r148311.
index 1c61c38..f4f11d5 100644 (file)
 #include "WebHitTestResult.h"
 
 #include "WebCoreArgumentCoders.h"
-
+#include <WebCore/Document.h>
+#include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
+#include <WebCore/HitTestResult.h>
 #include <WebCore/KURL.h>
+#include <WebCore/Node.h>
 #include <wtf/text/WTFString.h>
 
 using namespace WebCore;
@@ -34,6 +38,27 @@ PassRefPtr<WebHitTestResult> WebHitTestResult::create(const WebHitTestResult::Da
     return adoptRef(new WebHitTestResult(hitTestResultData));
 }
 
+WebHitTestResult::Data::Data()
+{
+}
+
+WebHitTestResult::Data::Data(const HitTestResult& hitTestResult)
+    : absoluteImageURL(hitTestResult.absoluteImageURL().string())
+    , absolutePDFURL(hitTestResult.absolutePDFURL().string())
+    , absoluteLinkURL(hitTestResult.absoluteLinkURL().string())
+    , absoluteMediaURL(hitTestResult.absoluteMediaURL().string())
+    , linkLabel(hitTestResult.textContent())
+    , linkTitle(hitTestResult.titleDisplayString())
+    , isContentEditable(hitTestResult.isContentEditable())
+    , elementBoundingBox(elementBoundingBoxInWindowCoordinates(hitTestResult))
+    , isScrollbar(hitTestResult.scrollbar())
+{
+}
+
+WebHitTestResult::Data::~Data()
+{
+}
+
 void WebHitTestResult::Data::encode(CoreIPC::ArgumentEncoder& encoder) const
 {
     encoder << absoluteImageURL;
@@ -63,4 +88,21 @@ bool WebHitTestResult::Data::decode(CoreIPC::ArgumentDecoder& decoder, WebHitTes
     return true;
 }
 
+IntRect WebHitTestResult::Data::elementBoundingBoxInWindowCoordinates(const HitTestResult& hitTestResult)
+{
+    Node* node = hitTestResult.innerNonSharedNode();
+    if (!node)
+        return IntRect();
+
+    Frame* frame = node->document()->frame();
+    if (!frame)
+        return IntRect();
+
+    FrameView* view = frame->view();
+    if (!view)
+        return IntRect();
+
+    return view->contentsToWindow(node->pixelSnappedBoundingBox());
+}
+
 } // WebKit
index a5b246d..fa5c997 100644 (file)
 #define WebHitTestResult_h
 
 #include "APIObject.h"
-#include <WebCore/FrameView.h>
-#include <WebCore/HitTestResult.h>
-#include <WebCore/KURL.h>
-#include <WebCore/Node.h>
+#include <WebCore/IntRect.h>
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ -35,6 +32,10 @@ class ArgumentDecoder;
 class ArgumentEncoder;
 }
 
+namespace WebCore {
+class HitTestResult;
+}
+
 namespace WebKit {
 
 class WebFrame;
@@ -52,42 +53,14 @@ public:
         WebCore::IntRect elementBoundingBox;
         bool isScrollbar;
 
-        Data()
-        {
-        }
-
-        WebCore::IntRect elementBoundingBoxInWindowCoordinates(const WebCore::HitTestResult& hitTestResult)
-        {
-            WebCore::Node* node = hitTestResult.innerNonSharedNode();
-            if (!node)
-                return WebCore::IntRect();
-
-            WebCore::Frame* frame = node->document()->frame();
-            if (!frame)
-                return WebCore::IntRect();
-
-            WebCore::FrameView* view = frame->view();
-            if (!view)
-                return WebCore::IntRect();
-
-            return view->contentsToWindow(node->pixelSnappedBoundingBox());
-        }
-
-        explicit Data(const WebCore::HitTestResult& hitTestResult)
-            : absoluteImageURL(hitTestResult.absoluteImageURL().string())
-            , absolutePDFURL(hitTestResult.absolutePDFURL().string())
-            , absoluteLinkURL(hitTestResult.absoluteLinkURL().string())
-            , absoluteMediaURL(hitTestResult.absoluteMediaURL().string())
-            , linkLabel(hitTestResult.textContent())
-            , linkTitle(hitTestResult.titleDisplayString())
-            , isContentEditable(hitTestResult.isContentEditable())
-            , elementBoundingBox(elementBoundingBoxInWindowCoordinates(hitTestResult))
-            , isScrollbar(hitTestResult.scrollbar())
-        {
-        }
+        Data();
+        explicit Data(const WebCore::HitTestResult&);
+        ~Data();
 
         void encode(CoreIPC::ArgumentEncoder&) const;
         static bool decode(CoreIPC::ArgumentDecoder&, WebHitTestResult::Data&);
+
+        WebCore::IntRect elementBoundingBoxInWindowCoordinates(const WebCore::HitTestResult&);
     };
 
     static PassRefPtr<WebHitTestResult> create(const WebHitTestResult::Data&);
index b390b89..fd0e1d9 100644 (file)
@@ -31,6 +31,7 @@
 #include "WebContext.h"
 #include "WebContextClient.h"
 #include "WebProcessMessages.h"
+#include <wtf/CurrentTime.h>
 
 using namespace WebCore;
 
index 8aef4e5..184942e 100644 (file)
 #include "NetworkProcessProxy.h"
 #endif
 
+#if PLATFORM(MAC)
+OBJC_CLASS NSString;
+#endif
+
 namespace WebKit {
 
 class DownloadProxy;
index f8926f1..e80e513 100644 (file)
@@ -100,6 +100,7 @@ namespace WebCore {
     class Cursor;
     class DragData;
     class FloatRect;
+    class GraphicsLayer;
     class IntSize;
     class ProtectionSpace;
     class SharedBuffer;
index 975d166..a6885e9 100644 (file)
@@ -33,6 +33,7 @@
 #include "WKData.h"
 #include "WebFrame.h"
 #include "WebSecurityOrigin.h"
+#include <WebCore/Document.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
index a2b4a0b..b397a33 100644 (file)
@@ -30,6 +30,7 @@
 #include "WebFrame.h"
 #include "WebFrameLoaderClient.h"
 #include <WebCore/DOMWindowExtension.h>
+#include <WebCore/DOMWrapperWorld.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <wtf/HashMap.h>
index c8ae337..fe3ce1d 100644 (file)
 #include "JSNPObject.h"
 #include "NPRuntimeObjectMap.h"
 #include "NPRuntimeUtilities.h"
+#include <JavaScriptCore/JSCJSValueInlines.h>
+#include <JavaScriptCore/JSCellInlines.h>
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/StrongInlines.h>
-#include <WebCore/Frame.h>  
+#include <WebCore/Frame.h>
 #include <WebCore/IdentifierRep.h>
 #include <wtf/text/WTFString.h>
 
index 9f526ff..7f2befc 100644 (file)
@@ -39,7 +39,9 @@
 #include <JavaScriptCore/SourceCode.h>
 #include <JavaScriptCore/Strong.h>
 #include <JavaScriptCore/StrongInlines.h>
+#include <WebCore/DOMWrapperWorld.h>
 #include <WebCore/Frame.h>
+#include <WebCore/ScriptController.h>
 
 using namespace JSC;
 using namespace WebCore;
index 92b95cb..de8fe5c 100644 (file)
@@ -40,6 +40,7 @@ typedef const struct OpaqueJSContext* JSContextRef;
 typedef struct OpaqueJSValue* JSObjectRef;
 typedef const struct OpaqueJSValue* JSValueRef;
 
+OBJC_CLASS NSArray;
 OBJC_CLASS PDFAnnotation;
 OBJC_CLASS PDFLayerController;
 OBJC_CLASS PDFSelection;
index f6ee3bf..1053db4 100644 (file)
@@ -58,6 +58,7 @@
 #include <WebCore/ProxyServer.h>
 #include <WebCore/RenderEmbeddedObject.h>
 #include <WebCore/ResourceLoadScheduler.h>
+#include <WebCore/ScriptController.h>
 #include <WebCore/ScriptValue.h>
 #include <WebCore/ScrollView.h>
 #include <WebCore/SecurityOrigin.h>
index 9a003a1..b022a89 100644 (file)
@@ -27,6 +27,7 @@
 #include "StorageAreaImpl.h"
 
 #include "StorageAreaMap.h"
+#include <WebCore/Document.h>
 #include <WebCore/ExceptionCode.h>
 #include <WebCore/Frame.h>
 #include <WebCore/Page.h>
index b1d3a48..863631b 100644 (file)
@@ -33,6 +33,7 @@
 #include "StorageNamespaceImpl.h"
 #include "WebPage.h"
 #include "WebProcess.h"
+#include <WebCore/DOMWindow.h>
 #include <WebCore/Frame.h>
 #include <WebCore/Page.h>
 #include <WebCore/Storage.h>
index 50eb4da..c080f7d 100644 (file)
@@ -59,6 +59,7 @@
 #include <WebCore/RenderTreeAsText.h>
 #include <WebCore/ResourceBuffer.h>
 #include <WebCore/ResourceLoader.h>
+#include <WebCore/ScriptController.h>
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/TextIterator.h>
 #include <WebCore/TextResourceDecoder.h>
index 1929559..ee68fbf 100644 (file)
 #include <WebCore/HTMLPlugInImageElement.h>
 #include <WebCore/HistoryController.h>
 #include <WebCore/HistoryItem.h>
+#include <WebCore/JSDOMWindow.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/MIMETypeRegistry.h>
 #include <WebCore/MouseEvent.h>
 #include <WebCore/RunLoop.h>
 #include <WebCore/RuntimeEnabledFeatures.h>
 #include <WebCore/SchemeRegistry.h>
+#include <WebCore/ScriptController.h>
 #include <WebCore/ScriptValue.h>
 #include <WebCore/SerializedScriptValue.h>
 #include <WebCore/Settings.h>