Changeset 149871 in webkit


Ignore:
Timestamp:
May 10, 2013 5:51:58 AM (11 years ago)
Author:
andersca@apple.com
Message:

Remove ScriptInstance.h
​https://bugs.webkit.org/show_bug.cgi?id=115900

Reviewed by Andreas Kling.

Remove yet another abstraction now that we don't support V8.

  • GNUmakefile.list.am:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/ScriptController.h:

(Bindings):
(ScriptController):

  • bindings/js/ScriptControllerMac.mm:

(WebCore::ScriptController::createScriptInstanceForWidget):

  • bindings/js/ScriptInstance.h: Removed.
  • html/HTMLPlugInElement.cpp:

(WebCore::HTMLPlugInElement::getInstance):

  • html/HTMLPlugInElement.h:

(Bindings):
(HTMLPlugInElement):

  • platform/graphics/wince/MediaPlayerProxy.h:

(WebMediaPlayerProxy):

  • rendering/RenderEmbeddedObject.cpp:
  • rendering/RenderSnapshottedPlugIn.cpp:
Location:
trunk/Source/WebCore
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149869 r149871  
     12013-05-10  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove ScriptInstance.h
     4        https://bugs.webkit.org/show_bug.cgi?id=115900
     5
     6        Reviewed by Andreas Kling.
     7
     8        Remove yet another abstraction now that we don't support V8.
     9
     10        * GNUmakefile.list.am:
     11        * WebCore.vcproj/WebCore.vcproj:
     12        * WebCore.vcxproj/WebCore.vcxproj:
     13        * WebCore.vcxproj/WebCore.vcxproj.filters:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * bindings/js/ScriptController.h:
     16        (Bindings):
     17        (ScriptController):
     18        * bindings/js/ScriptControllerMac.mm:
     19        (WebCore::ScriptController::createScriptInstanceForWidget):
     20        * bindings/js/ScriptInstance.h: Removed.
     21        * html/HTMLPlugInElement.cpp:
     22        (WebCore::HTMLPlugInElement::getInstance):
     23        * html/HTMLPlugInElement.h:
     24        (Bindings):
     25        (HTMLPlugInElement):
     26        * platform/graphics/wince/MediaPlayerProxy.h:
     27        (WebMediaPlayerProxy):
     28        * rendering/RenderEmbeddedObject.cpp:
     29        * rendering/RenderSnapshottedPlugIn.cpp:
     30
    1312013-05-10  Anders Carlsson  <andersca@apple.com>
    232

  • trunk/Source/WebCore/GNUmakefile.list.am

    r149796 r149871  
    25442544        Source/WebCore/bindings/js/ScriptGCEvent.h \
    25452545        Source/WebCore/bindings/js/ScriptHeapSnapshot.h \
    2546         Source/WebCore/bindings/js/ScriptInstance.h \
    25472546        Source/WebCore/bindings/js/ScriptObject.cpp \
    25482547        Source/WebCore/bindings/js/ScriptObject.h \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r149708 r149871  
    7307173071                                </File>
    7307273072                                <File
    73073                                         RelativePath="..\bindings\js\ScriptInstance.h"
    73074                                         >
    73075                                 </File>
    73076                                 <File
    7307773073                                        RelativePath="..\bindings\js\ScriptObject.cpp"
    7307873074                                        >

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r149755 r149871  
    1294412944    <ClInclude Include="..\bindings\js\ScriptGCEvent.h" />
    1294512945    <ClInclude Include="..\bindings\js\ScriptHeapSnapshot.h" />
    12946     <ClInclude Include="..\bindings\js\ScriptInstance.h" />
    1294712946    <ClInclude Include="..\bindings\js\ScriptObject.h" />
    1294812947    <ClInclude Include="..\bindings\js\ScriptProfile.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r149755 r149871  
    1149411494      <Filter>bindings\js</Filter>
    1149511495    </ClInclude>
    11496     <ClInclude Include="..\bindings\js\ScriptInstance.h">
    11497       <Filter>bindings\js</Filter>
    11498     </ClInclude>
    1149911496    <ClInclude Include="..\bindings\js\ScriptObject.h">
    1150011497      <Filter>bindings\js</Filter>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r149796 r149871  
    28252825                934CC0E20ED39D6F00A658F2 /* ScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC0E00ED39D6F00A658F2 /* ScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28262826                934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */; };
    2827                 934CC1170EDCAC7300A658F2 /* ScriptInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC1160EDCAC7300A658F2 /* ScriptInstance.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28282827                934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */; };
    28292828                934D9BA70B8C1175007B42A9 /* WebCoreNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    92549253                934CC0E00ED39D6F00A658F2 /* ScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptValue.h; sourceTree = "<group>"; };
    92559254                934CC1090EDB223900A658F2 /* ScriptSourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptSourceCode.h; sourceTree = "<group>"; };
    9256                 934CC1160EDCAC7300A658F2 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = "<group>"; };
    92579255                934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreNSStringExtras.mm; sourceTree = "<group>"; };
    92589256                934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreNSStringExtras.h; sourceTree = "<group>"; };
    … …  
    1877018768                                4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */,
    1877118769                                9F3B947D12241758005304E7 /* ScriptHeapSnapshot.h */,
    18772                                 934CC1160EDCAC7300A658F2 /* ScriptInstance.h */,
    1877318770                                41F066E30F64BCF600A07EAC /* ScriptObject.cpp */,
    1877418771                                41F066E20F64BCF600A07EAC /* ScriptObject.h */,
    … …  
    2334023337                                4FD8D0F3119C718B002FA825 /* ScriptGCEvent.h in Headers */,
    2334123338                                9F3B947E12241758005304E7 /* ScriptHeapSnapshot.h in Headers */,
    23342                                 934CC1170EDCAC7300A658F2 /* ScriptInstance.h in Headers */,
    2334323339                                41F066E40F64BCF600A07EAC /* ScriptObject.h in Headers */,
    2334423340                                FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,

  • trunk/Source/WebCore/bindings/js/ScriptController.h

    r149865 r149871  
    2626#include "JSDOMWindowShell.h"
    2727#include "ScriptControllerBase.h"
    28 #include "ScriptInstance.h"
    2928#include <JavaScriptCore/JSBase.h>
    3029#include <heap/Strong.h>
    … …  
    4645
    4746    namespace Bindings {
     47        class Instance;
    4848        class RootObject;
    4949    }
    … …  
    135135    void updatePlatformScriptObjects();
    136136
    137     PassScriptInstance createScriptInstanceForWidget(Widget*);
     137    PassRefPtr<JSC::Bindings::Instance> createScriptInstanceForWidget(Widget*);
    138138    JSC::Bindings::RootObject* bindingRootObject();
    139139    JSC::Bindings::RootObject* cacheableBindingRootObject();

  • trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm

    r149401 r149871  
    6161namespace WebCore {
    6262
    63 PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widget)
     63PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget)
    6464{
    6565    NSView* widgetView = widget->platformWidget();

  • trunk/Source/WebCore/html/HTMLPlugInElement.cpp

    r148545 r149871  
    2525
    2626#include "Attribute.h"
     27#include "BridgeJSC.h"
    2728#include "Chrome.h"
    2829#include "ChromeClient.h"
    … …  
    119120}
    120121
    121 PassScriptInstance HTMLPlugInElement::getInstance()
     122PassRefPtr<JSC::Bindings::Instance> HTMLPlugInElement::getInstance()
    122123{
    123124    Frame* frame = document()->frame();

  • trunk/Source/WebCore/html/HTMLPlugInElement.h

    r148487 r149871  
    2727#include "Image.h"
    2828
    29 #include "ScriptInstance.h"
    30 
    3129#if ENABLE(NETSCAPE_PLUGIN_API)
    3230struct NPObject;
    3331#endif
     32
     33namespace JSC {
     34namespace Bindings {
     35class Instance;
     36}
     37}
    3438
    3539namespace WebCore {
    … …  
    4549    void resetInstance();
    4650
    47     PassScriptInstance getInstance();
     51    PassRefPtr<JSC::Bindings::Instance> getInstance();
    4852
    4953    Widget* pluginWidget() const;
    … …  
    105109    virtual bool isPluginElement() const;
    106110
    107     mutable ScriptInstance m_instance;
     111    RefPtr<JSC::Bindings::Instance> m_instance;
    108112#if ENABLE(NETSCAPE_PLUGIN_API)
    109113    NPObject* m_NPObject;

  • trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h

    r95901 r149871  
    2525
    2626#include <wtf/Forward.h>
    27 #include "ScriptInstance.h"
    2827
    2928namespace WebCore {
    … …  
    5554        HTMLMediaElement* element();
    5655        void invokeMethod(const String& methodName);
    57         ScriptInstance pluginInstance();
     56        RefPtr<JSC::Bindings::Instance> pluginInstance();
    5857
    5958    private:

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r148545 r149871  
    5656#include "Text.h"
    5757#include "TextRun.h"
     58#include <wtf/StackStats.h>
    5859
    5960#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)

  • trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp

    r149586 r149871  
    4343#include "PlatformMouseEvent.h"
    4444#include "RenderView.h"
     45#include <wtf/StackStats.h>
    4546
    4647namespace WebCore {
Note: See TracChangeset for help on using the changeset viewer.