Changeset 44682 in webkit


Ignore:
Timestamp:
Jun 15, 2009 4:53:05 AM (15 years ago)
Author:
Simon Hausmann
Message:

2009-06-15 Joe Ligman <joseph.ligman@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix build break
Rename JSONObject to InspectorJSONObject

https://bugs.webkit.org/show_bug.cgi?id=26340

Location:
trunk/WebCore
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r44681 r44682  
     12009-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
    1422009-06-12  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    243
  • trunk/WebCore/GNUmakefile.am

    r44652 r44682  
    11061106        WebCore/inspector/JavaScriptProfileNode.cpp \
    11071107        WebCore/inspector/JavaScriptProfileNode.h \
    1108         WebCore/inspector/JSONObject.cpp \
    1109         WebCore/inspector/JSONObject.h \
     1108        WebCore/inspector/InspectorJSONObject.cpp \
     1109        WebCore/inspector/InspectorJSONObject.h \
    11101110        WebCore/loader/Cache.cpp \
    11111111        WebCore/loader/Cache.h \
  • trunk/WebCore/WebCore.pro

    r44681 r44682  
    826826    inspector/InspectorFrontend.cpp \
    827827    inspector/InspectorResource.cpp \
    828     inspector/JSONObject.cpp \
     828    inspector/InspectorJSONObject.cpp \
    829829    loader/archive/ArchiveFactory.cpp \
    830830    loader/archive/ArchiveResource.cpp \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r44652 r44682  
    1586815868                        </File>
    1586915869                        <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"
    1587515875                                >
    1587615876                        </File>
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r44515 r44682  
    994994                7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; };
    995995                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 */; };
    998998                7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; };
    999999                7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
     
    59385938                7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
    59395939                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>"; };
    59425942                7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
    59435943                7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
     
    96919691                                1C81B9FC0E9733CB00266E07 /* JavaScriptProfileNode.cpp */,
    96929692                                1C81B9FB0E9733CB00266E07 /* JavaScriptProfileNode.h */,
    9693                                 7AB6F8850FB9D27100805D02 /* JSONObject.cpp */,
    9694                                 7AB6F8860FB9D27100805D02 /* JSONObject.h */,
     9693                                7AB6F8850FB9D27100805D02 /* InspectorJSONObject.cpp */,
     9694                                7AB6F8860FB9D27100805D02 /* InspectorJSONObject.h */,
    96959695                                BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */,
    96969696                        );
     
    1674016740                                1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */,
    1674116741                                1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */,
    16742                                 7AB6F8880FB9D27100805D02 /* JSONObject.h in Headers */,
     16742                                7AB6F8880FB9D27100805D02 /* InspectorJSONObject.h in Headers */,
    1674316743                                7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */,
    1674416744                                65C97AF308EA908800ACD273 /* config.h in Headers */,
     
    1873218732                                E1F1E82F0C3C2BB9006DB391 /* XSLTExtensions.cpp in Sources */,
    1873318733                                93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */,
    18734                                 7AB6F8870FB9D27100805D02 /* JSONObject.cpp in Sources */,
     18734                                7AB6F8870FB9D27100805D02 /* InspectorJSONObject.cpp in Sources */,
    1873518735                                7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */,
    1873618736                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
  • trunk/WebCore/WebCoreSources.bkl

    r44634 r44682  
    657657        inspector/JavaScriptProfile.cpp
    658658        inspector/JavaScriptProfileNode.cpp
    659         inspector/JSONObject.cpp
     659        inspector/InspectorJSONObject.cpp
    660660    </set>
    661661
  • trunk/WebCore/inspector/ConsoleMessage.cpp

    r43864 r44682  
    3333
    3434#include "InspectorFrontend.h"
    35 #include "JSONObject.h"
     35#include "InspectorJSONObject.h"
    3636#include "ScriptCallStack.h"
    3737#include "ScriptObjectQuarantine.h"
     
    7676void ConsoleMessage::addToConsole(InspectorFrontend* frontend)
    7777{
    78     JSONObject jsonObj = frontend->newJSONObject();
     78    InspectorJSONObject jsonObj = frontend->newInspectorJSONObject();
    7979    jsonObj.set("source", static_cast<int>(m_source));
    8080    jsonObj.set("level", static_cast<int>(m_level));
  • trunk/WebCore/inspector/InspectorDOMStorageResource.cpp

    r43864 r44682  
    3737#include "Frame.h"
    3838#include "InspectorFrontend.h"
    39 #include "JSONObject.h"
     39#include "InspectorJSONObject.h"
    4040#include "ScriptObjectQuarantine.h"
    4141#include "Storage.h"
     
    6363        return;
    6464
    65     JSONObject jsonObject = frontend->newJSONObject();
     65    InspectorJSONObject jsonObject = frontend->newInspectorJSONObject();
    6666    ScriptObject domStorage;
    6767    if (!getQuarantinedScriptObject(m_frame.get(), m_domStorage.get(), domStorage))
  • trunk/WebCore/inspector/InspectorDatabaseResource.cpp

    r43864 r44682  
    3737#include "Frame.h"
    3838#include "InspectorFrontend.h"
    39 #include "JSONObject.h"
     39#include "InspectorJSONObject.h"
    4040#include "ScriptObjectQuarantine.h"
    4141
     
    5757        return;
    5858
    59     JSONObject jsonObject = frontend->newJSONObject();
     59    InspectorJSONObject jsonObject = frontend->newInspectorJSONObject();
    6060    ScriptObject database;
    6161    if (!getQuarantinedScriptObject(m_database.get(), database))
  • trunk/WebCore/inspector/InspectorFrontend.cpp

    r44398 r44682  
    3434#include "Frame.h"
    3535#include "InspectorController.h"  // TODO(pfeldman): Extract SpecialPanels to remove include.
    36 #include "JSONObject.h"
     36#include "InspectorJSONObject.h"
    3737#include "Node.h"
    3838#include "ScriptFunctionCall.h"
     
    6262}
    6363
    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)
     64InspectorJSONObject InspectorFrontend::newInspectorJSONObject() {
     65    return InspectorJSONObject::createNew(m_scriptState);
     66}
     67
     68void InspectorFrontend::addMessageToConsole(const InspectorJSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)
    6969{
    7070    OwnPtr<ScriptFunctionCall> function(newFunctionCall("addMessageToConsole"));
     
    8181}
    8282
    83 bool InspectorFrontend::addResource(long long identifier, const JSONObject& resourceObj)
     83bool InspectorFrontend::addResource(long long identifier, const InspectorJSONObject& resourceObj)
    8484{
    8585    OwnPtr<ScriptFunctionCall> function(newFunctionCall("addResource"));
     
    9191}
    9292
    93 bool InspectorFrontend::updateResource(long long identifier, const JSONObject& resourceObj)
     93bool InspectorFrontend::updateResource(long long identifier, const InspectorJSONObject& resourceObj)
    9494{
    9595    OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateResource"));
     
    261261
    262262#if ENABLE(DATABASE)
    263 bool InspectorFrontend::addDatabase(const JSONObject& dbObject)
     263bool InspectorFrontend::addDatabase(const InspectorJSONObject& dbObject)
    264264{
    265265    OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDatabase"));
     
    272272
    273273#if ENABLE(DOM_STORAGE)
    274 bool InspectorFrontend::addDOMStorage(const JSONObject& domStorageObj)
     274bool InspectorFrontend::addDOMStorage(const InspectorJSONObject& domStorageObj)
    275275{
    276276    OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDOMStorage"));
  • trunk/WebCore/inspector/InspectorFrontend.h

    r44398 r44682  
    3131#define InspectorFrontend_h
    3232
    33 #include "JSONObject.h"
     33#include "InspectorJSONObject.h"
    3434#include "ScriptState.h"
    3535#include <wtf/PassOwnPtr.h>
     
    5454        InspectorFrontend(ScriptState*, ScriptObject webInspector);
    5555        ~InspectorFrontend();
    56         JSONObject newJSONObject();
     56        InspectorJSONObject newInspectorJSONObject();
    5757
    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);
    5959       
    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);
    6262        void removeResource(long long identifier);
    6363
     
    8787
    8888#if ENABLE(DATABASE)
    89         bool addDatabase(const JSONObject& dbObj);
     89        bool addDatabase(const InspectorJSONObject& dbObj);
    9090#endif
    9191       
    9292#if ENABLE(DOM_STORAGE)
    93         bool addDOMStorage(const JSONObject& domStorageObj);
     93        bool addDOMStorage(const InspectorJSONObject& domStorageObj);
    9494#endif
    9595
  • trunk/WebCore/inspector/InspectorJSONObject.cpp

    r44681 r44682  
    2929
    3030#include "config.h"
    31 #include "JSONObject.h"
     31#include "InspectorJSONObject.h"
    3232
    3333#include "PlatformString.h"
     
    3737namespace WebCore {
    3838
    39 JSONObject::JSONObject(ScriptState* scriptState)
     39InspectorJSONObject::InspectorJSONObject(ScriptState* scriptState)
    4040    : m_scriptState(scriptState)
    4141{
     
    4343}
    4444
    45 bool JSONObject::set(const String& name, const String& value)
     45bool InspectorJSONObject::set(const String& name, const String& value)
    4646{
    4747    return m_scriptObject.set(m_scriptState, name, value);
    4848}
    4949
    50 bool JSONObject::set(const char* name, const ScriptObject& value)
     50bool InspectorJSONObject::set(const char* name, const ScriptObject& value)
    5151{
    5252    return m_scriptObject.set(m_scriptState, name, value);
    5353}
    5454
    55 bool JSONObject::set(const char* name, const JSONObject& value)
     55bool InspectorJSONObject::set(const char* name, const InspectorJSONObject& value)
    5656{
    5757    return set(name, value.scriptObject());
    5858}
    5959
    60 bool JSONObject::set(const char* name, const String& value)
     60bool InspectorJSONObject::set(const char* name, const String& value)
    6161{
    6262    return m_scriptObject.set(m_scriptState, name, value);
    6363}
    6464
    65 bool JSONObject::set(const char* name, double value)
     65bool InspectorJSONObject::set(const char* name, double value)
    6666{
    6767    return m_scriptObject.set(m_scriptState, name, value);
    6868}
    6969
    70 bool JSONObject::set(const char* name, long long value)
     70bool InspectorJSONObject::set(const char* name, long long value)
    7171{
    7272    return m_scriptObject.set(m_scriptState, name, value);
    7373}
    7474
    75 bool JSONObject::set(const char* name, int value)
     75bool InspectorJSONObject::set(const char* name, int value)
    7676{
    7777    return m_scriptObject.set(m_scriptState, name, value);
    7878}
    7979
    80 bool JSONObject::set(const char* name, bool value)
     80bool InspectorJSONObject::set(const char* name, bool value)
    8181{
    8282    return m_scriptObject.set(m_scriptState, name, value);
    8383}
    8484
    85 ScriptObject JSONObject::scriptObject() const
     85ScriptObject InspectorJSONObject::scriptObject() const
    8686{
    8787    return m_scriptObject;
    8888}
    8989
    90 JSONObject JSONObject::createNew(ScriptState* scriptState)
     90InspectorJSONObject InspectorJSONObject::createNew(ScriptState* scriptState)
    9191{
    92     return JSONObject(scriptState);
     92    return InspectorJSONObject(scriptState);
    9393}
    9494
  • trunk/WebCore/inspector/InspectorJSONObject.h

    r44681 r44682  
    2929
    3030
    31 #ifndef JSONObject_h
    32 #define JSONObject_h
     31#ifndef InspectorJSONObject_h
     32#define InspectorJSONObject_h
    3333
    3434#include "ScriptObject.h"
     
    3838    class String;
    3939
    40     class JSONObject {
     40    class InspectorJSONObject {
    4141    public:
    4242        bool set(const String& name, const String&);
    43         bool set(const char* name, const JSONObject&);
     43        bool set(const char* name, const InspectorJSONObject&);
    4444        bool set(const char* name, const ScriptObject&);
    4545        bool set(const char* name, const String&);
     
    5050        ScriptObject scriptObject() const;
    5151
    52         static JSONObject createNew(ScriptState* scriptState);
     52        static InspectorJSONObject createNew(ScriptState* scriptState);
    5353    private:
    54         JSONObject(ScriptState* scriptState);
     54        InspectorJSONObject(ScriptState* scriptState);
    5555        ScriptState* m_scriptState;
    5656        ScriptObject m_scriptObject;
     
    5858}
    5959
    60 #endif // JSONObject_h
     60#endif // InspectorJSONObject.h
  • trunk/WebCore/inspector/InspectorResource.cpp

    r43864 r44682  
    3737#include "Frame.h"
    3838#include "InspectorFrontend.h"
    39 #include "JSONObject.h"
     39#include "InspectorJSONObject.h"
    4040#include "ResourceRequest.h"
    4141#include "ResourceResponse.h"
     
    106106}
    107107
    108 static void populateHeadersObject(JSONObject* object, const HTTPHeaderMap& headers)
     108static void populateHeadersObject(InspectorJSONObject* object, const HTTPHeaderMap& headers)
    109109{
    110110    HTTPHeaderMap::const_iterator end = headers.end();
     
    117117{
    118118    if (!m_scriptObjectCreated) {
    119         JSONObject jsonObject = frontend->newJSONObject();
    120         JSONObject requestHeaders = frontend->newJSONObject();
     119        InspectorJSONObject jsonObject = frontend->newInspectorJSONObject();
     120        InspectorJSONObject requestHeaders = frontend->newInspectorJSONObject();
    121121        populateHeadersObject(&requestHeaders, m_requestHeaderFields);
    122122        jsonObject.set("requestHeaders", requestHeaders);
     
    144144        return;
    145145
    146     JSONObject jsonObject = frontend->newJSONObject();
     146    InspectorJSONObject jsonObject = frontend->newInspectorJSONObject();
    147147    if (m_changes.hasChange(RequestChange)) {
    148148        jsonObject.set("url", requestURL());
     
    150150        jsonObject.set("path", m_requestURL.path());
    151151        jsonObject.set("lastPathComponent", m_requestURL.lastPathComponent());
    152         JSONObject requestHeaders = frontend->newJSONObject();
     152        InspectorJSONObject requestHeaders = frontend->newInspectorJSONObject();
    153153        populateHeadersObject(&requestHeaders, m_requestHeaderFields);
    154154        jsonObject.set("requestHeaders", requestHeaders);
     
    163163        jsonObject.set("statusCode", m_responseStatusCode);
    164164        jsonObject.set("suggestedFilename", m_suggestedFilename);
    165         JSONObject responseHeaders = frontend->newJSONObject();
     165        InspectorJSONObject responseHeaders = frontend->newInspectorJSONObject();
    166166        populateHeadersObject(&responseHeaders, m_responseHeaderFields);
    167167        jsonObject.set("responseHeaders", responseHeaders);
Note: See TracChangeset for help on using the changeset viewer.