Skip to content
Permalink
Browse files
Make Frame's ScriptController an OwnPtr and remove the #include
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:


Canonical link: https://commits.webkit.org/132953@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148373 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
weinig committed Apr 14, 2013
1 parent 4fbc731 commit 84514dcdd070c6b7963fe91540421fa367de227f
Showing with 249 additions and 54 deletions.
  1. +50 −0 Source/WebCore/ChangeLog
  2. +1 −0 Source/WebCore/Modules/networkinfo/NetworkInfoConnection.cpp
  3. +1 −0 Source/WebCore/Modules/websockets/WebSocket.cpp
  4. +1 −0 Source/WebCore/bindings/generic/BindingSecurity.cpp
  5. +1 −0 Source/WebCore/bindings/js/JSEventListener.cpp
  6. +1 −0 Source/WebCore/bindings/js/JSLazyEventListener.cpp
  7. +1 −0 Source/WebCore/bindings/js/PageScriptDebugServer.cpp
  8. +1 −0 Source/WebCore/bindings/js/ScriptEventListener.cpp
  9. +1 −0 Source/WebCore/bindings/js/ScriptState.cpp
  10. +1 −0 Source/WebCore/bindings/objc/DOM.mm
  11. +2 −0 Source/WebCore/bindings/objc/DOMAbstractView.mm
  12. +1 −0 Source/WebCore/bindings/objc/DOMInternal.mm
  13. +1 −0 Source/WebCore/dom/Clipboard.cpp
  14. +1 −0 Source/WebCore/dom/DocumentStyleSheetCollection.cpp
  15. +1 −0 Source/WebCore/dom/EventTarget.cpp
  16. +1 −0 Source/WebCore/dom/ScriptElement.cpp
  17. +1 −0 Source/WebCore/editing/atk/FrameSelectionAtk.cpp
  18. +1 −0 Source/WebCore/history/CachedFrame.cpp
  19. +1 −0 Source/WebCore/html/HTMLCanvasElement.cpp
  20. +1 −0 Source/WebCore/html/HTMLDocument.cpp
  21. +1 −0 Source/WebCore/html/HTMLElement.cpp
  22. +1 −0 Source/WebCore/html/HTMLFormElement.cpp
  23. +1 −0 Source/WebCore/html/HTMLPlugInElement.cpp
  24. +1 −0 Source/WebCore/html/HTMLPlugInImageElement.cpp
  25. +1 −0 Source/WebCore/html/parser/HTMLParserOptions.cpp
  26. +1 −0 Source/WebCore/html/parser/XSSAuditorDelegate.cpp
  27. +1 −0 Source/WebCore/inspector/InspectorAgent.cpp
  28. +1 −0 Source/WebCore/inspector/InspectorController.cpp
  29. +2 −0 Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
  30. +1 −0 Source/WebCore/inspector/InspectorFrontendHost.cpp
  31. +5 −3 Source/WebCore/inspector/InspectorInstrumentation.cpp
  32. +1 −0 Source/WebCore/inspector/InspectorOverlay.cpp
  33. +2 −0 Source/WebCore/inspector/InspectorPageAgent.cpp
  34. +1 −0 Source/WebCore/inspector/PageRuntimeAgent.cpp
  35. +1 −1 Source/WebCore/loader/DocumentWriter.cpp
  36. +1 −0 Source/WebCore/loader/NavigationScheduler.cpp
  37. +1 −0 Source/WebCore/loader/SubframeLoader.cpp
  38. +1 −0 Source/WebCore/loader/cache/CachedResourceLoader.cpp
  39. +1 −0 Source/WebCore/page/BarInfo.cpp
  40. +1 −0 Source/WebCore/page/DOMWindow.cpp
  41. +1 −0 Source/WebCore/page/EventSource.cpp
  42. +3 −3 Source/WebCore/page/Frame.cpp
  43. +3 −3 Source/WebCore/page/Frame.h
  44. +1 −0 Source/WebCore/page/Navigator.cpp
  45. +1 −0 Source/WebCore/page/Page.cpp
  46. +1 −0 Source/WebCore/page/PageGroup.cpp
  47. +2 −0 Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
  48. +1 −0 Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
  49. +1 −0 Source/WebCore/plugins/DOMMimeTypeArray.cpp
  50. +1 −0 Source/WebCore/plugins/DOMPlugin.cpp
  51. +1 −0 Source/WebCore/plugins/DOMPluginArray.cpp
  52. +1 −0 Source/WebCore/plugins/PluginView.cpp
  53. +2 −0 Source/WebCore/plugins/efl/PluginViewEfl.cpp
  54. +4 −3 Source/WebCore/plugins/gtk/PluginViewGtk.cpp
  55. +1 −0 Source/WebCore/plugins/qt/PluginViewQt.cpp
  56. +1 −0 Source/WebCore/storage/Storage.cpp
  57. +1 −0 Source/WebCore/xml/XMLHttpRequest.cpp
  58. +1 −0 Source/WebCore/xml/XMLTreeViewer.cpp
  59. +1 −0 Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
  60. +1 −0 Source/WebKit/gtk/webkit/webkitwebview.cpp
  61. +14 −0 Source/WebKit/mac/ChangeLog
  62. +1 −0 Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
  63. +4 −2 Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm
  64. +1 −0 Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm
  65. +1 −0 Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
  66. +1 −0 Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
  67. +1 −0 Source/WebKit/mac/WebView/WebFrame.mm
  68. +1 −0 Source/WebKit/qt/Api/qwebelement.cpp
  69. +1 −0 Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
  70. +1 −0 Source/WebKit/qt/WidgetApi/qwebframe.cpp
  71. +1 −0 Source/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
  72. +1 −0 Source/WebKit/win/WebView.cpp
  73. +23 −0 Source/WebKit2/ChangeLog
  74. +43 −1 Source/WebKit2/Shared/WebHitTestResult.cpp
  75. +10 −37 Source/WebKit2/Shared/WebHitTestResult.h
  76. +1 −0 Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp
  77. +4 −0 Source/WebKit2/UIProcess/WebContext.h
  78. +1 −0 Source/WebKit2/UIProcess/WebPageProxy.h
  79. +1 −0 Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
  80. +1 −0 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
  81. +3 −1 Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
  82. +2 −0 Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
  83. +1 −0 Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
  84. +1 −0 Source/WebKit2/WebProcess/Plugins/PluginView.cpp
  85. +1 −0 Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp
  86. +1 −0 Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp
  87. +1 −0 Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
  88. +2 −0 Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -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
@@ -30,6 +30,7 @@
#include "NetworkInfoConnection.h"

#if ENABLE(NETWORK_INFO)
#include "Document.h"
#include "Event.h"
#include "Frame.h"
#include "NetworkInfoClient.h"
@@ -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"
@@ -37,6 +37,7 @@
#include "Frame.h"
#include "HTMLFrameElementBase.h"
#include "HTMLParserIdioms.h"
#include "JSDOMBinding.h"
#include "SecurityOrigin.h"
#include "Settings.h"

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -29,6 +29,7 @@
#import "DOMNodeInternal.h"
#import "Frame.h"
#import "JSNode.h"
#import "ScriptController.h"
#import "WebScriptObjectPrivate.h"
#import "runtime_root.h"

@@ -30,6 +30,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "Image.h"
#include "ScriptWrappableInlines.h"

namespace WebCore {

@@ -29,6 +29,7 @@
#include "DocumentStyleSheetCollection.h"

#include "CSSStyleSheet.h"
#include "DOMWrapperWorld.h"
#include "Document.h"
#include "Element.h"
#include "HTMLIFrameElement.h"
@@ -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>
@@ -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"
@@ -23,6 +23,7 @@
#if HAVE(ACCESSIBILITY)

#include "AXObjectCache.h"
#include "Document.h"
#include "Frame.h"
#include "WebKitAccessibleWrapperAtk.h"

@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -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"
@@ -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>
@@ -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"
@@ -29,6 +29,7 @@
#include "Document.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "ScriptController.h"
#include "Settings.h"

namespace WebCore {
@@ -38,6 +38,7 @@
#include "InspectorValues.h"
#include "PingLoader.h"
#include "SecurityOrigin.h"
#include <wtf/text/StringBuilder.h>

namespace WebCore {

@@ -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"
@@ -34,6 +34,7 @@

#include "InspectorController.h"

#include "DOMWrapperWorld.h"
#include "Frame.h"
#include "GraphicsContext.h"
#include "IdentifiersFactory.h"
@@ -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"
@@ -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"
@@ -39,22 +39,22 @@
#include "ConsoleAPITypes.h"
#include "ConsoleTypes.h"
#include "DOMWindow.h"
#include "DOMWrapperWorld.h"
#include "Database.h"
#include "DeviceOrientationData.h"
#include "DocumentLoader.h"
#include "Event.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"
@@ -69,10 +69,12 @@
#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"
@@ -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"
@@ -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"
@@ -42,6 +42,7 @@
#include "InstrumentingAgents.h"
#include "Page.h"
#include "PageConsole.h"
#include "ScriptController.h"
#include "SecurityOrigin.h"

using WebCore::TypeBuilder::Runtime::ExecutionContextDescription;
@@ -39,14 +39,14 @@
#include "PlaceholderDocument.h"
#include "PluginDocument.h"
#include "RawDataDocumentParser.h"
#include "ScriptController.h"
#include "ScriptableDocumentParser.h"
#include "SecurityOrigin.h"
#include "SegmentedString.h"
#include "Settings.h"
#include "SinkDocument.h"
#include "TextResourceDecoder.h"


namespace WebCore {

static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame* parentFrame)
@@ -47,6 +47,7 @@
#include "HistoryItem.h"
#include "InspectorInstrumentation.h"
#include "Page.h"
#include "ScriptController.h"
#include "UserGestureIndicator.h"
#include <wtf/CurrentTime.h>

@@ -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"

0 comments on commit 84514dc

Please sign in to comment.