Changeset 64735 in webkit


Ignore:
Timestamp:
Aug 5, 2010 5:36:31 AM (14 years ago)
Author:
yurys@chromium.org
Message:

2010-08-05 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: remove mutator methods from ScriptObject and remove ScriptArray.
We shouldn't modify JS objects from InspectorController, InspectorValues
should be used instead.
​https://bugs.webkit.org/show_bug.cgi?id=43546

  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/ScriptArray.cpp: Removed.
  • bindings/js/ScriptArray.h: Removed.
  • bindings/js/ScriptCallStack.h:
  • bindings/js/ScriptObject.cpp:
  • bindings/js/ScriptObject.h:
  • bindings/v8/ScriptArray.cpp: Removed.
  • bindings/v8/ScriptArray.h: Removed.
  • bindings/v8/ScriptCallStack.h:
  • bindings/v8/ScriptObject.cpp:
  • bindings/v8/ScriptObject.h:
Location:
trunk/WebCore
Files:
4 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r64734 r64735  
     12010-08-05  Yury Semikhatsky  <yurys@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: remove mutator methods from ScriptObject and remove ScriptArray.
     6        We shouldn't modify JS objects from InspectorController, InspectorValues
     7        should be used instead.
     8        https://bugs.webkit.org/show_bug.cgi?id=43546
     9
     10        * GNUmakefile.am:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * bindings/js/ScriptArray.cpp: Removed.
     16        * bindings/js/ScriptArray.h: Removed.
     17        * bindings/js/ScriptCallStack.h:
     18        * bindings/js/ScriptObject.cpp:
     19        * bindings/js/ScriptObject.h:
     20        * bindings/v8/ScriptArray.cpp: Removed.
     21        * bindings/v8/ScriptArray.h: Removed.
     22        * bindings/v8/ScriptCallStack.h:
     23        * bindings/v8/ScriptObject.cpp:
     24        * bindings/v8/ScriptObject.h:
     25
    1262010-08-05  Ned Holbrook  <nholbrook@apple.com>
    227

  • trunk/WebCore/GNUmakefile.am

    r64642 r64735  
    756756        WebCore/bindings/js/ScheduledAction.cpp \
    757757        WebCore/bindings/js/ScheduledAction.h \
    758         WebCore/bindings/js/ScriptArray.cpp \
    759         WebCore/bindings/js/ScriptArray.h \
    760758        WebCore/bindings/js/ScriptCachedFrameData.cpp \
    761759        WebCore/bindings/js/ScriptCachedFrameData.h \

  • trunk/WebCore/WebCore.gypi

    r64685 r64735  
    669669            'bindings/js/ScheduledAction.cpp',
    670670            'bindings/js/ScheduledAction.h',
    671             'bindings/js/ScriptArray.cpp',
    672             'bindings/js/ScriptArray.h',
    673671            'bindings/js/ScriptCachedFrameData.cpp',
    674672            'bindings/js/ScriptCachedFrameData.h',
    … …  
    835833            'bindings/v8/ScopedDOMDataStore.cpp',
    836834            'bindings/v8/ScopedDOMDataStore.h',
    837             'bindings/v8/ScriptArray.cpp',
    838             'bindings/v8/ScriptArray.h',
    839835            'bindings/v8/ScriptCachedFrameData.h',
    840836            'bindings/v8/ScriptCallFrame.cpp',

  • trunk/WebCore/WebCore.pro

    r64685 r64735  
    369369    bindings/js/JSPopStateEventCustom.cpp \
    370370    bindings/js/JSWorkerContextErrorHandler.cpp \
    371     bindings/js/ScriptArray.cpp \
    372371    bindings/js/ScriptCachedFrameData.cpp \
    373372    bindings/js/ScriptCallFrame.cpp \
    … …  
    11251124    bindings/js/JavaScriptCallFrame.h \
    11261125    bindings/js/ScheduledAction.h \
    1127     bindings/js/ScriptArray.h \
    11281126    bindings/js/ScriptCachedFrameData.h \
    11291127    bindings/js/ScriptCallFrame.h \

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

    r64645 r64735  
    4775747757                                </File>
    4775847758                                <File
    47759                                         RelativePath="..\bindings\js\ScriptArray.cpp"
    47760                                         >
    47761                                         <FileConfiguration
    47762                                                 Name="Debug|Win32"
    47763                                                 ExcludedFromBuild="true"
    47764                                                 >
    47765                                                 <Tool
    47766                                                         Name="VCCLCompilerTool"
    47767                                                 />
    47768                                         </FileConfiguration>
    47769                                         <FileConfiguration
    47770                                                 Name="Release|Win32"
    47771                                                 ExcludedFromBuild="true"
    47772                                                 >
    47773                                                 <Tool
    47774                                                         Name="VCCLCompilerTool"
    47775                                                 />
    47776                                         </FileConfiguration>
    47777                                         <FileConfiguration
    47778                                                 Name="Debug_Internal|Win32"
    47779                                                 ExcludedFromBuild="true"
    47780                                                 >
    47781                                                 <Tool
    47782                                                         Name="VCCLCompilerTool"
    47783                                                 />
    47784                                         </FileConfiguration>
    47785                                         <FileConfiguration
    47786                                                 Name="Debug_Cairo|Win32"
    47787                                                 ExcludedFromBuild="true"
    47788                                                 >
    47789                                                 <Tool
    47790                                                         Name="VCCLCompilerTool"
    47791                                                 />
    47792                                         </FileConfiguration>
    47793                                         <FileConfiguration
    47794                                                 Name="Release_Cairo|Win32"
    47795                                                 ExcludedFromBuild="true"
    47796                                                 >
    47797                                                 <Tool
    47798                                                         Name="VCCLCompilerTool"
    47799                                                 />
    47800                                         </FileConfiguration>
    47801                                         <FileConfiguration
    47802                                                 Name="Debug_All|Win32"
    47803                                                 ExcludedFromBuild="true"
    47804                                                 >
    47805                                                 <Tool
    47806                                                         Name="VCCLCompilerTool"
    47807                                                 />
    47808                                         </FileConfiguration>
    47809                                 </File>
    47810                                 <File
    47811                                         RelativePath="..\bindings\js\ScriptArray.h"
    47812                                         >
    47813                                 </File>
    47814                                 <File
    4781547759                                        RelativePath="..\bindings\js\ScriptCachedFrameData.cpp"
    4781647760                                        >

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

    r64685 r64735  
    14021402                7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */; };
    14031403                7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
    1404                 7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */; };
    1405                 7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14061404                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */; };
    14071405                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    71997197                7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHost.cpp; sourceTree = "<group>"; };
    72007198                7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectorFrontendHost.h; sourceTree = "<group>"; };
    7201                 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArray.cpp; sourceTree = "<group>"; };
    7202                 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArray.h; sourceTree = "<group>"; };
    72037199                7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMAgent.cpp; sourceTree = "<group>"; };
    72047200                7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMAgent.h; sourceTree = "<group>"; };
    … …  
    1580615802                                BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
    1580715803                                BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
    15808                                 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */,
    15809                                 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */,
    1581015804                                41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */,
    1581115805                                41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */,
    … …  
    1943319427                                BCEC01BE0C274DAC009F4EC9 /* Screen.h in Headers */,
    1943419428                                A84D82C111D3474800972990 /* ScriptableDocumentParser.h in Headers */,
    19435                                 7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */,
    1943619429                                7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */,
    1943719430                                41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */,
    … …  
    2191021903                                BCEC01BD0C274DAC009F4EC9 /* Screen.cpp in Sources */,
    2191121904                                A84D82C211D3474800972990 /* ScriptableDocumentParser.cpp in Sources */,
    21912                                 7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */,
    2191321905                                200B190911C277D900DCCD3A /* ScriptBreakpoint.cpp in Sources */,
    2191421906                                41F1D2200EF35C2A00DA8753 /* ScriptCachedFrameData.cpp in Sources */,

  • trunk/WebCore/bindings/js/IDBBindingUtilities.h

    r63064 r64735  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "ScriptValue.h"
    3231#include <wtf/Forward.h>
    3332

  • trunk/WebCore/bindings/js/ScheduledAction.cpp

    r60631 r64735  
    3535#include "ScriptExecutionContext.h"
    3636#include "ScriptSourceCode.h"
    37 #include "ScriptValue.h"
    3837#include <runtime/JSLock.h>
    3938

  • trunk/WebCore/bindings/js/ScriptCallStack.h

    r62542 r64735  
    3232#define ScriptCallStack_h
    3333
    34 #include "ScriptArray.h"
    3534#include "ScriptCallFrame.h"
    3635#include "ScriptState.h"

  • trunk/WebCore/bindings/js/ScriptObject.cpp

    r64124 r64735  
    6060}
    6161
    62 bool ScriptObject::set(const String& name, const String& value)
    63 {
    64     JSLock lock(SilenceAssertionsOnly);
    65     PutPropertySlot slot;
    66     jsObject()->put(m_scriptState, Identifier(m_scriptState, stringToUString(name)), jsString(m_scriptState, stringToUString(value)), slot);
    67     return handleException(m_scriptState);
    68 }
    69 
    70 bool ScriptObject::set(const char* name, const ScriptObject& value)
    71 {
    72     if (value.scriptState() != m_scriptState) {
    73         ASSERT_NOT_REACHED();
    74         return false;
    75     }
    76     JSLock lock(SilenceAssertionsOnly);
    77     PutPropertySlot slot;
    78     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), value.jsObject(), slot);
    79     return handleException(m_scriptState);
    80 }
    81 
    82 bool ScriptObject::set(const char* name, const String& value)
    83 {
    84     JSLock lock(SilenceAssertionsOnly);
    85     PutPropertySlot slot;
    86     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsString(m_scriptState, value), slot);
    87     return handleException(m_scriptState);
    88 }
    89 
    90 bool ScriptObject::set(const char* name, double value)
    91 {
    92     JSLock lock(SilenceAssertionsOnly);
    93     PutPropertySlot slot;
    94     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    95     return handleException(m_scriptState);
    96 }
    97 
    98 bool ScriptObject::set(const char* name, long value)
    99 {
    100     JSLock lock(SilenceAssertionsOnly);
    101     PutPropertySlot slot;
    102     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    103     return handleException(m_scriptState);
    104 }
    105 
    106 bool ScriptObject::set(const char* name, long long value)
    107 {
    108     JSLock lock(SilenceAssertionsOnly);
    109     PutPropertySlot slot;
    110     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    111     return handleException(m_scriptState);
    112 }
    113 
    114 bool ScriptObject::set(const char* name, int value)
    115 {
    116     JSLock lock(SilenceAssertionsOnly);
    117     PutPropertySlot slot;
    118     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    119     return handleException(m_scriptState);
    120 }
    121 
    122 bool ScriptObject::set(const char* name, unsigned value)
    123 {
    124     JSLock lock(SilenceAssertionsOnly);
    125     PutPropertySlot slot;
    126     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    127     return handleException(m_scriptState);
    128 }
    129 
    130 bool ScriptObject::set(const char* name, unsigned long value)
    131 {
    132     JSLock lock(SilenceAssertionsOnly);
    133     PutPropertySlot slot;
    134     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
    135     return handleException(m_scriptState);
    136 }
    137 
    138 bool ScriptObject::set(const char* name, bool value)
    139 {
    140     JSLock lock(SilenceAssertionsOnly);
    141     PutPropertySlot slot;
    142     jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsBoolean(value), slot);
    143     return handleException(m_scriptState);
    144 }
    145 
    146 ScriptObject ScriptObject::createNew(ScriptState* scriptState)
    147 {
    148     JSLock lock(SilenceAssertionsOnly);
    149     return ScriptObject(scriptState, constructEmptyObject(scriptState));
    150 }
    151 
    15262bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
    15363{

  • trunk/WebCore/bindings/js/ScriptObject.h

    r64124 r64735  
    4949        ScriptState* scriptState() const { return m_scriptState; }
    5050
    51         bool set(const String& name, const String&);
    52         bool set(const char* name, const ScriptObject&);
    53         bool set(const char* name, const String&);
    54         bool set(const char* name, double);
    55         bool set(const char* name, long);
    56         bool set(const char* name, long long);
    57         bool set(const char* name, int);
    58         bool set(const char* name, unsigned);
    59         bool set(const char* name, unsigned long);
    60         bool set(const char* name, bool);
    61 
    62         static ScriptObject createNew(ScriptState*);
    63    
    6451    protected:
    6552        ScriptState* m_scriptState;

  • trunk/WebCore/bindings/v8/ScheduledAction.cpp

    r54627 r64735  
    3535#include "ScriptExecutionContext.h"
    3636#include "ScriptSourceCode.h"
    37 #include "ScriptValue.h"
    3837
    3938#include "V8Binding.h"

  • trunk/WebCore/bindings/v8/ScriptCallStack.h

    r63805 r64735  
    3232#define ScriptCallStack_h
    3333
    34 #include "ScriptArray.h"
    3534#include "ScriptCallFrame.h"
    3635#include "ScriptState.h"

  • trunk/WebCore/bindings/v8/ScriptObject.cpp

    r64124 r64735  
    5858}
    5959
    60 bool ScriptObject::set(const String& name, const String& value)
    61 {
    62     ScriptScope scope(m_scriptState);
    63     v8Object()->Set(v8String(name), v8String(value));
    64     return scope.success();
    65 }
    66 
    67 bool ScriptObject::set(const char* name, const ScriptObject& value)
    68 {
    69     if (value.scriptState() != m_scriptState) {
    70         ASSERT_NOT_REACHED();
    71         return false;
    72     }
    73     ScriptScope scope(m_scriptState);
    74     v8Object()->Set(v8::String::New(name), value.v8Value());
    75     return scope.success();
    76 }
    77 
    78 bool ScriptObject::set(const char* name, const String& value)
    79 {
    80     ScriptScope scope(m_scriptState);
    81     v8Object()->Set(v8::String::New(name), v8String(value));
    82     return scope.success();
    83 }
    84 
    85 bool ScriptObject::set(const char* name, double value)
    86 {
    87     ScriptScope scope(m_scriptState);
    88     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    89     return scope.success();
    90 }
    91 
    92 bool ScriptObject::set(const char* name, long value)
    93 {
    94     ScriptScope scope(m_scriptState);
    95     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    96     return scope.success();
    97 }
    98 
    99 bool ScriptObject::set(const char* name, long long value)
    100 {
    101     ScriptScope scope(m_scriptState);
    102     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    103     return scope.success();
    104 }
    105 
    106 bool ScriptObject::set(const char* name, int value)
    107 {
    108     ScriptScope scope(m_scriptState);
    109     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    110     return scope.success();
    111 }
    112 
    113 bool ScriptObject::set(const char* name, unsigned value)
    114 {
    115     ScriptScope scope(m_scriptState);
    116     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    117     return scope.success();
    118 }
    119 
    120 bool ScriptObject::set(const char* name, unsigned long value)
    121 {
    122     ScriptScope scope(m_scriptState);
    123     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
    124     return scope.success();
    125 }
    126 
    127 bool ScriptObject::set(const char* name, bool value)
    128 {
    129     ScriptScope scope(m_scriptState);
    130     v8Object()->Set(v8::String::New(name), v8Boolean(value));
    131     return scope.success();
    132 }
    133 
    134 ScriptObject ScriptObject::createNew(ScriptState* scriptState)
    135 {
    136     ScriptScope scope(scriptState);
    137     return ScriptObject(scriptState, v8::Object::New());
    138 }
    139 
    14060bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
    14161{

  • trunk/WebCore/bindings/v8/ScriptObject.h

    r64124 r64735  
    4949        v8::Local<v8::Object> v8Object() const;
    5050        ScriptState* scriptState() const { return m_scriptState; }
    51 
    52         bool set(const String& name, const String&);
    53         bool set(const char* name, const ScriptObject&);
    54         bool set(const char* name, const String&);
    55         bool set(const char* name, double);
    56         bool set(const char* name, long);
    57         bool set(const char* name, long long);
    58         bool set(const char* name, int);
    59         bool set(const char* name, unsigned);
    60         bool set(const char* name, unsigned long);
    61         bool set(const char* name, bool);
    62 
    63         static ScriptObject createNew(ScriptState*);
    6451    protected:
    6552        ScriptState* m_scriptState;

  • trunk/WebCore/loader/FrameLoader.cpp

    r64051 r64735  
    9191#include "ScriptSourceCode.h"
    9292#include "ScriptString.h"
    93 #include "ScriptValue.h"
    9493#include "SecurityOrigin.h"
    9594#include "SegmentedString.h"
     95#include "SerializedScriptValue.h"
    9696#include "Settings.h"
    9797#include "TextResourceDecoder.h"

  • trunk/WebCore/page/Frame.cpp

    r64409 r64735  
    7373#include "ScriptController.h"
    7474#include "ScriptSourceCode.h"
    75 #include "ScriptValue.h"
    7675#include "Settings.h"
    7776#include "TextIterator.h"
Note: See TracChangeset for help on using the changeset viewer.