Changeset 44682 in webkit
- Timestamp:
- Jun 15, 2009 4:53:05 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 12 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r44681 r44682 1 2009-06-15 Joe Ligman <joseph.ligman@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Fix build break 6 Rename JSONObject to InspectorJSONObject 7 8 https://bugs.webkit.org/show_bug.cgi?id=26340 9 10 * GNUmakefile.am: 11 * WebCore.pro: 12 * WebCore.vcproj/WebCore.vcproj: 13 * WebCore.xcodeproj/project.pbxproj: 14 * WebCoreSources.bkl: 15 * inspector/ConsoleMessage.cpp: 16 (WebCore::ConsoleMessage::addToConsole): 17 * inspector/InspectorDOMStorageResource.cpp: 18 (WebCore::InspectorDOMStorageResource::bind): 19 * inspector/InspectorDatabaseResource.cpp: 20 (WebCore::InspectorDatabaseResource::bind): 21 * inspector/InspectorFrontend.cpp: 22 (WebCore::InspectorFrontend::newInspectorJSONObject): 23 (WebCore::InspectorFrontend::addMessageToConsole): 24 (WebCore::InspectorFrontend::addResource): 25 (WebCore::InspectorFrontend::updateResource): 26 (WebCore::InspectorFrontend::addDatabase): 27 (WebCore::InspectorFrontend::addDOMStorage): 28 * inspector/InspectorFrontend.h: 29 * inspector/InspectorJSONObject.cpp: Copied from WebCore/inspector/JSONObject.cpp. 30 (WebCore::InspectorJSONObject::InspectorJSONObject): 31 (WebCore::InspectorJSONObject::set): 32 (WebCore::InspectorJSONObject::scriptObject): 33 (WebCore::InspectorJSONObject::createNew): 34 * inspector/InspectorJSONObject.h: Copied from WebCore/inspector/JSONObject.h. 35 * inspector/InspectorResource.cpp: 36 (WebCore::populateHeadersObject): 37 (WebCore::InspectorResource::createScriptObject): 38 (WebCore::InspectorResource::updateScriptObject): 39 * inspector/JSONObject.cpp: Removed. 40 * inspector/JSONObject.h: Removed. 41 1 42 2009-06-12 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 43 -
trunk/WebCore/GNUmakefile.am
r44652 r44682 1106 1106 WebCore/inspector/JavaScriptProfileNode.cpp \ 1107 1107 WebCore/inspector/JavaScriptProfileNode.h \ 1108 WebCore/inspector/ JSONObject.cpp \1109 WebCore/inspector/ JSONObject.h \1108 WebCore/inspector/InspectorJSONObject.cpp \ 1109 WebCore/inspector/InspectorJSONObject.h \ 1110 1110 WebCore/loader/Cache.cpp \ 1111 1111 WebCore/loader/Cache.h \ -
trunk/WebCore/WebCore.pro
r44681 r44682 826 826 inspector/InspectorFrontend.cpp \ 827 827 inspector/InspectorResource.cpp \ 828 inspector/ JSONObject.cpp \828 inspector/InspectorJSONObject.cpp \ 829 829 loader/archive/ArchiveFactory.cpp \ 830 830 loader/archive/ArchiveResource.cpp \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r44652 r44682 15868 15868 </File> 15869 15869 <File 15870 RelativePath="..\inspector\ JSONObject.cpp"15871 > 15872 </File> 15873 <File 15874 RelativePath="..\inspector\ JSONObject.h"15870 RelativePath="..\inspector\InspectorJSONObject.cpp" 15871 > 15872 </File> 15873 <File 15874 RelativePath="..\inspector\InspectorJSONObject.h" 15875 15875 > 15876 15876 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r44515 r44682 994 994 7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; }; 995 995 7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; }; 996 7AB6F8870FB9D27100805D02 /* JSONObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB6F8850FB9D27100805D02 /*JSONObject.cpp */; };997 7AB6F8880FB9D27100805D02 /* JSONObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB6F8860FB9D27100805D02 /*JSONObject.h */; };996 7AB6F8870FB9D27100805D02 /* InspectorJSONObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB6F8850FB9D27100805D02 /* InspectorJSONObject.cpp */; }; 997 7AB6F8880FB9D27100805D02 /* InspectorJSONObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB6F8860FB9D27100805D02 /* InspectorJSONObject.h */; }; 998 998 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; }; 999 999 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; }; … … 5938 5938 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; }; 5939 5939 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroupLoadDeferrer.h; sourceTree = "<group>"; }; 5940 7AB6F8850FB9D27100805D02 /* JSONObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path =JSONObject.cpp; sourceTree = "<group>"; };5941 7AB6F8860FB9D27100805D02 /* JSONObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =JSONObject.h; sourceTree = "<group>"; };5940 7AB6F8850FB9D27100805D02 /* InspectorJSONObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSONObject.cpp; sourceTree = "<group>"; }; 5941 7AB6F8860FB9D27100805D02 /* InspectorJSONObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorJSONObject.h; sourceTree = "<group>"; }; 5942 5942 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; }; 5943 5943 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; }; … … 9691 9691 1C81B9FC0E9733CB00266E07 /* JavaScriptProfileNode.cpp */, 9692 9692 1C81B9FB0E9733CB00266E07 /* JavaScriptProfileNode.h */, 9693 7AB6F8850FB9D27100805D02 /* JSONObject.cpp */,9694 7AB6F8860FB9D27100805D02 /* JSONObject.h */,9693 7AB6F8850FB9D27100805D02 /* InspectorJSONObject.cpp */, 9694 7AB6F8860FB9D27100805D02 /* InspectorJSONObject.h */, 9695 9695 BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */, 9696 9696 ); … … 16740 16740 1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */, 16741 16741 1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */, 16742 7AB6F8880FB9D27100805D02 /* JSONObject.h in Headers */,16742 7AB6F8880FB9D27100805D02 /* InspectorJSONObject.h in Headers */, 16743 16743 7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */, 16744 16744 65C97AF308EA908800ACD273 /* config.h in Headers */, … … 18732 18732 E1F1E82F0C3C2BB9006DB391 /* XSLTExtensions.cpp in Sources */, 18733 18733 93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */, 18734 7AB6F8870FB9D27100805D02 /* JSONObject.cpp in Sources */,18734 7AB6F8870FB9D27100805D02 /* InspectorJSONObject.cpp in Sources */, 18735 18735 7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */, 18736 18736 E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */, -
trunk/WebCore/WebCoreSources.bkl
r44634 r44682 657 657 inspector/JavaScriptProfile.cpp 658 658 inspector/JavaScriptProfileNode.cpp 659 inspector/ JSONObject.cpp659 inspector/InspectorJSONObject.cpp 660 660 </set> 661 661 -
trunk/WebCore/inspector/ConsoleMessage.cpp
r43864 r44682 33 33 34 34 #include "InspectorFrontend.h" 35 #include " JSONObject.h"35 #include "InspectorJSONObject.h" 36 36 #include "ScriptCallStack.h" 37 37 #include "ScriptObjectQuarantine.h" … … 76 76 void ConsoleMessage::addToConsole(InspectorFrontend* frontend) 77 77 { 78 JSONObject jsonObj = frontend->newJSONObject();78 InspectorJSONObject jsonObj = frontend->newInspectorJSONObject(); 79 79 jsonObj.set("source", static_cast<int>(m_source)); 80 80 jsonObj.set("level", static_cast<int>(m_level)); -
trunk/WebCore/inspector/InspectorDOMStorageResource.cpp
r43864 r44682 37 37 #include "Frame.h" 38 38 #include "InspectorFrontend.h" 39 #include " JSONObject.h"39 #include "InspectorJSONObject.h" 40 40 #include "ScriptObjectQuarantine.h" 41 41 #include "Storage.h" … … 63 63 return; 64 64 65 JSONObject jsonObject = frontend->newJSONObject();65 InspectorJSONObject jsonObject = frontend->newInspectorJSONObject(); 66 66 ScriptObject domStorage; 67 67 if (!getQuarantinedScriptObject(m_frame.get(), m_domStorage.get(), domStorage)) -
trunk/WebCore/inspector/InspectorDatabaseResource.cpp
r43864 r44682 37 37 #include "Frame.h" 38 38 #include "InspectorFrontend.h" 39 #include " JSONObject.h"39 #include "InspectorJSONObject.h" 40 40 #include "ScriptObjectQuarantine.h" 41 41 … … 57 57 return; 58 58 59 JSONObject jsonObject = frontend->newJSONObject();59 InspectorJSONObject jsonObject = frontend->newInspectorJSONObject(); 60 60 ScriptObject database; 61 61 if (!getQuarantinedScriptObject(m_database.get(), database)) -
trunk/WebCore/inspector/InspectorFrontend.cpp
r44398 r44682 34 34 #include "Frame.h" 35 35 #include "InspectorController.h" // TODO(pfeldman): Extract SpecialPanels to remove include. 36 #include " JSONObject.h"36 #include "InspectorJSONObject.h" 37 37 #include "Node.h" 38 38 #include "ScriptFunctionCall.h" … … 62 62 } 63 63 64 JSONObject InspectorFrontend::newJSONObject() {65 return JSONObject::createNew(m_scriptState);66 } 67 68 void InspectorFrontend::addMessageToConsole(const JSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)64 InspectorJSONObject InspectorFrontend::newInspectorJSONObject() { 65 return InspectorJSONObject::createNew(m_scriptState); 66 } 67 68 void InspectorFrontend::addMessageToConsole(const InspectorJSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message) 69 69 { 70 70 OwnPtr<ScriptFunctionCall> function(newFunctionCall("addMessageToConsole")); … … 81 81 } 82 82 83 bool InspectorFrontend::addResource(long long identifier, const JSONObject& resourceObj)83 bool InspectorFrontend::addResource(long long identifier, const InspectorJSONObject& resourceObj) 84 84 { 85 85 OwnPtr<ScriptFunctionCall> function(newFunctionCall("addResource")); … … 91 91 } 92 92 93 bool InspectorFrontend::updateResource(long long identifier, const JSONObject& resourceObj)93 bool InspectorFrontend::updateResource(long long identifier, const InspectorJSONObject& resourceObj) 94 94 { 95 95 OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateResource")); … … 261 261 262 262 #if ENABLE(DATABASE) 263 bool InspectorFrontend::addDatabase(const JSONObject& dbObject)263 bool InspectorFrontend::addDatabase(const InspectorJSONObject& dbObject) 264 264 { 265 265 OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDatabase")); … … 272 272 273 273 #if ENABLE(DOM_STORAGE) 274 bool InspectorFrontend::addDOMStorage(const JSONObject& domStorageObj)274 bool InspectorFrontend::addDOMStorage(const InspectorJSONObject& domStorageObj) 275 275 { 276 276 OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDOMStorage")); -
trunk/WebCore/inspector/InspectorFrontend.h
r44398 r44682 31 31 #define InspectorFrontend_h 32 32 33 #include " JSONObject.h"33 #include "InspectorJSONObject.h" 34 34 #include "ScriptState.h" 35 35 #include <wtf/PassOwnPtr.h> … … 54 54 InspectorFrontend(ScriptState*, ScriptObject webInspector); 55 55 ~InspectorFrontend(); 56 JSONObject newJSONObject();56 InspectorJSONObject newInspectorJSONObject(); 57 57 58 void addMessageToConsole(const JSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message);58 void addMessageToConsole(const InspectorJSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message); 59 59 60 bool addResource(long long identifier, const JSONObject& resourceObj);61 bool updateResource(long long identifier, const JSONObject& resourceObj);60 bool addResource(long long identifier, const InspectorJSONObject& resourceObj); 61 bool updateResource(long long identifier, const InspectorJSONObject& resourceObj); 62 62 void removeResource(long long identifier); 63 63 … … 87 87 88 88 #if ENABLE(DATABASE) 89 bool addDatabase(const JSONObject& dbObj);89 bool addDatabase(const InspectorJSONObject& dbObj); 90 90 #endif 91 91 92 92 #if ENABLE(DOM_STORAGE) 93 bool addDOMStorage(const JSONObject& domStorageObj);93 bool addDOMStorage(const InspectorJSONObject& domStorageObj); 94 94 #endif 95 95 -
trunk/WebCore/inspector/InspectorJSONObject.cpp
r44681 r44682 29 29 30 30 #include "config.h" 31 #include " JSONObject.h"31 #include "InspectorJSONObject.h" 32 32 33 33 #include "PlatformString.h" … … 37 37 namespace WebCore { 38 38 39 JSONObject::JSONObject(ScriptState* scriptState)39 InspectorJSONObject::InspectorJSONObject(ScriptState* scriptState) 40 40 : m_scriptState(scriptState) 41 41 { … … 43 43 } 44 44 45 bool JSONObject::set(const String& name, const String& value)45 bool InspectorJSONObject::set(const String& name, const String& value) 46 46 { 47 47 return m_scriptObject.set(m_scriptState, name, value); 48 48 } 49 49 50 bool JSONObject::set(const char* name, const ScriptObject& value)50 bool InspectorJSONObject::set(const char* name, const ScriptObject& value) 51 51 { 52 52 return m_scriptObject.set(m_scriptState, name, value); 53 53 } 54 54 55 bool JSONObject::set(const char* name, constJSONObject& value)55 bool InspectorJSONObject::set(const char* name, const InspectorJSONObject& value) 56 56 { 57 57 return set(name, value.scriptObject()); 58 58 } 59 59 60 bool JSONObject::set(const char* name, const String& value)60 bool InspectorJSONObject::set(const char* name, const String& value) 61 61 { 62 62 return m_scriptObject.set(m_scriptState, name, value); 63 63 } 64 64 65 bool JSONObject::set(const char* name, double value)65 bool InspectorJSONObject::set(const char* name, double value) 66 66 { 67 67 return m_scriptObject.set(m_scriptState, name, value); 68 68 } 69 69 70 bool JSONObject::set(const char* name, long long value)70 bool InspectorJSONObject::set(const char* name, long long value) 71 71 { 72 72 return m_scriptObject.set(m_scriptState, name, value); 73 73 } 74 74 75 bool JSONObject::set(const char* name, int value)75 bool InspectorJSONObject::set(const char* name, int value) 76 76 { 77 77 return m_scriptObject.set(m_scriptState, name, value); 78 78 } 79 79 80 bool JSONObject::set(const char* name, bool value)80 bool InspectorJSONObject::set(const char* name, bool value) 81 81 { 82 82 return m_scriptObject.set(m_scriptState, name, value); 83 83 } 84 84 85 ScriptObject JSONObject::scriptObject() const85 ScriptObject InspectorJSONObject::scriptObject() const 86 86 { 87 87 return m_scriptObject; 88 88 } 89 89 90 JSONObjectJSONObject::createNew(ScriptState* scriptState)90 InspectorJSONObject InspectorJSONObject::createNew(ScriptState* scriptState) 91 91 { 92 return JSONObject(scriptState);92 return InspectorJSONObject(scriptState); 93 93 } 94 94 -
trunk/WebCore/inspector/InspectorJSONObject.h
r44681 r44682 29 29 30 30 31 #ifndef JSONObject_h32 #define JSONObject_h31 #ifndef InspectorJSONObject_h 32 #define InspectorJSONObject_h 33 33 34 34 #include "ScriptObject.h" … … 38 38 class String; 39 39 40 class JSONObject {40 class InspectorJSONObject { 41 41 public: 42 42 bool set(const String& name, const String&); 43 bool set(const char* name, const JSONObject&);43 bool set(const char* name, const InspectorJSONObject&); 44 44 bool set(const char* name, const ScriptObject&); 45 45 bool set(const char* name, const String&); … … 50 50 ScriptObject scriptObject() const; 51 51 52 static JSONObject createNew(ScriptState* scriptState);52 static InspectorJSONObject createNew(ScriptState* scriptState); 53 53 private: 54 JSONObject(ScriptState* scriptState);54 InspectorJSONObject(ScriptState* scriptState); 55 55 ScriptState* m_scriptState; 56 56 ScriptObject m_scriptObject; … … 58 58 } 59 59 60 #endif // JSONObject_h60 #endif // InspectorJSONObject.h -
trunk/WebCore/inspector/InspectorResource.cpp
r43864 r44682 37 37 #include "Frame.h" 38 38 #include "InspectorFrontend.h" 39 #include " JSONObject.h"39 #include "InspectorJSONObject.h" 40 40 #include "ResourceRequest.h" 41 41 #include "ResourceResponse.h" … … 106 106 } 107 107 108 static void populateHeadersObject( JSONObject* object, const HTTPHeaderMap& headers)108 static void populateHeadersObject(InspectorJSONObject* object, const HTTPHeaderMap& headers) 109 109 { 110 110 HTTPHeaderMap::const_iterator end = headers.end(); … … 117 117 { 118 118 if (!m_scriptObjectCreated) { 119 JSONObject jsonObject = frontend->newJSONObject();120 JSONObject requestHeaders = frontend->newJSONObject();119 InspectorJSONObject jsonObject = frontend->newInspectorJSONObject(); 120 InspectorJSONObject requestHeaders = frontend->newInspectorJSONObject(); 121 121 populateHeadersObject(&requestHeaders, m_requestHeaderFields); 122 122 jsonObject.set("requestHeaders", requestHeaders); … … 144 144 return; 145 145 146 JSONObject jsonObject = frontend->newJSONObject();146 InspectorJSONObject jsonObject = frontend->newInspectorJSONObject(); 147 147 if (m_changes.hasChange(RequestChange)) { 148 148 jsonObject.set("url", requestURL()); … … 150 150 jsonObject.set("path", m_requestURL.path()); 151 151 jsonObject.set("lastPathComponent", m_requestURL.lastPathComponent()); 152 JSONObject requestHeaders = frontend->newJSONObject();152 InspectorJSONObject requestHeaders = frontend->newInspectorJSONObject(); 153 153 populateHeadersObject(&requestHeaders, m_requestHeaderFields); 154 154 jsonObject.set("requestHeaders", requestHeaders); … … 163 163 jsonObject.set("statusCode", m_responseStatusCode); 164 164 jsonObject.set("suggestedFilename", m_suggestedFilename); 165 JSONObject responseHeaders = frontend->newJSONObject();165 InspectorJSONObject responseHeaders = frontend->newInspectorJSONObject(); 166 166 populateHeadersObject(&responseHeaders, m_responseHeaderFields); 167 167 jsonObject.set("responseHeaders", responseHeaders);
Note: See TracChangeset
for help on using the changeset viewer.