Changeset 104938 in webkit


Ignore:
Timestamp:
Jan 13, 2012 8:03:04 AM (12 years ago)
Author:
vsevik@chromium.org
Message:

Unreviewed, rolling out r104935.
​http://trac.webkit.org/changeset/104935
​https://bugs.webkit.org/show_bug.cgi?id=76277

Breaks AppleWin compilation (Requested by vsevik on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-01-13

  • CMakeLists.txt:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • inspector/CodeGeneratorInspector.py:
  • inspector/Inspector.json:
  • inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

  • inspector/InspectorIndexedDBAgent.cpp: Removed.
  • inspector/InspectorIndexedDBAgent.h: Removed.
  • inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::buildObjectForFrame):

  • inspector/compile-front-end.sh:
  • inspector/front-end/IndexedDBModel.js: Removed.
  • inspector/front-end/ResourceTreeModel.js:

(WebInspector.ResourceTreeFrame):
(WebInspector.ResourceTreeFrame.prototype._navigate):

  • inspector/front-end/WebKit.qrc:
  • inspector/front-end/inspector.html:
Location:
trunk/Source/WebCore
Files:
3 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r104935 r104938  
    896896    inspector/InspectorFrontendClientLocal.cpp
    897897    inspector/InspectorFrontendHost.cpp
    898     inspector/InspectorIndexedDBAgent.cpp
    899898    inspector/InspectorInstrumentation.cpp
    900899    inspector/InspectorMemoryAgent.cpp

  • trunk/Source/WebCore/ChangeLog

    r104935 r104938  
     12012-01-13  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r104935.
     4        http://trac.webkit.org/changeset/104935
     5        https://bugs.webkit.org/show_bug.cgi?id=76277
     6
     7        Breaks AppleWin compilation (Requested by vsevik on #webkit).
     8
     9        * CMakeLists.txt:
     10        * WebCore.gypi:
     11        * WebCore.vcproj/WebCore.vcproj:
     12        * inspector/CodeGeneratorInspector.py:
     13        * inspector/Inspector.json:
     14        * inspector/InspectorController.cpp:
     15        (WebCore::InspectorController::InspectorController):
     16        * inspector/InspectorIndexedDBAgent.cpp: Removed.
     17        * inspector/InspectorIndexedDBAgent.h: Removed.
     18        * inspector/InspectorPageAgent.cpp:
     19        (WebCore::InspectorPageAgent::buildObjectForFrame):
     20        * inspector/compile-front-end.sh:
     21        * inspector/front-end/IndexedDBModel.js: Removed.
     22        * inspector/front-end/ResourceTreeModel.js:
     23        (WebInspector.ResourceTreeFrame):
     24        (WebInspector.ResourceTreeFrame.prototype._navigate):
     25        * inspector/front-end/WebKit.qrc:
     26        * inspector/front-end/inspector.html:
     27
    1282012-01-13  Vsevolod Vlasov  <vsevik@chromium.org>
    229

  • trunk/Source/WebCore/WebCore.gypi

    r104935 r104938  
    27792779            'inspector/InspectorFrontendHost.cpp',
    27802780            'inspector/InspectorFrontendHost.h',
    2781             'inspector/InspectorIndexedDBAgent.cpp',
    2782             'inspector/InspectorIndexedDBAgent.h',
    27832781            'inspector/InspectorInstrumentation.cpp',
    27842782            'inspector/InspectorInstrumentation.h',
    … …  
    64696467            'inspector/front-end/HelpScreen.js',
    64706468            'inspector/front-end/ImageView.js',
    6471             'inspector/front-end/IndexedDBModel.js',
    64726469            'inspector/front-end/InspectorBackend.js',
    64736470            'inspector/front-end/InspectorFrontendAPI.js',

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

    r104935 r104938  
    7140771407                        </File>
    7140871408                        <File
    71409                                 RelativePath="..\inspector\InspectorIndexedDBAgent.cpp"
    71410                                 >
    71411                         </File>
    71412                         <File
    71413                                 RelativePath="..\inspector\InspectorIndexedDBAgent.h"
    71414                                 >
    71415                         </File>
    71416                         <File
    7141771409                                RelativePath="..\inspector\InspectorInstrumentation.cpp"
    7141871410                                >
    … …  
    7191171903                                <File
    7191271904                                        RelativePath="..\inspector\front-end\ImageView.js"
    71913                                         >
    71914                                 </File>
    71915                                 <File
    71916                                         RelativePath="..\inspector\front-end\IndexedDBModel.js"
    7191771905                                        >
    7191871906                                </File>

  • trunk/Source/WebCore/inspector/CodeGeneratorInspector.py

    r104935 r104938  
    4444    "DOMDebugger": "JAVASCRIPT_DEBUGGER",
    4545    "FileSystem": "FILE_SYSTEM",
    46     "IndexedDB": "INDEXED_DATABASE",
    4746    "Profiler": "JAVASCRIPT_DEBUGGER",
    4847    "Worker": "WORKERS",

  • trunk/Source/WebCore/inspector/Inspector.json

    r104935 r104938  
    109109                    { "name": "name", "type": "string", "optional": true, "description": "Frame's name as specified in the tag." },
    110110                    { "name": "url", "type": "string", "description": "Frame document's URL." },
    111                     { "name": "securityOrigin", "type": "string", "optional": true, "description": "Frame document's security origin." },
    112111                    { "name": "mimeType", "type": "string", "description": "Frame document's mimeType as determined by the browser." }
    113112                ],
    … …  
    898897                    { "name": "transactionId", "type": "integer" },
    899898                    { "name": "sqlError", "$ref": "Error" }
    900                 ]
    901             }
    902         ]
    903     },
    904     {
    905         "domain": "IndexedDB",
    906         "hidden": true,
    907         "types": [
    908             {
    909                 "id": "FrameWithDatabaseNames",
    910                 "type": "object",
    911                 "description": "Origin with database names and frame ids.",
    912                 "properties": [
    913                     { "name": "frameId", "$ref": "Network.FrameId", "description": "Frame id." },
    914                     { "name": "securityOrigin", "type": "string", "description": "Security origin." },
    915                     { "name": "databaseNames", "type": "array", "items": { "type": "string" }, "description": "Database names for this origin." }
    916                 ]
    917             }
    918         ],
    919         "commands": [
    920             {
    921                 "name": "enable",
    922                 "description": "Enables events from backend."
    923             },
    924             {
    925                 "name": "disable",
    926                 "description": "Disables events from backend."
    927             },
    928             {
    929                 "name": "requestDatabaseNamesForFrame",
    930                 "parameters": [
    931                     { "name": "frameId", "$ref": "Network.FrameId" }
    932                 ],
    933                 "description": "Requests database names for given frame's security origin."
    934             }
    935         ],
    936         "events": [
    937             {
    938                 "name": "databaseNamesLoaded",
    939                 "parameters": [
    940                     { "name": "frameWithDatabaseNames", "$ref": "FrameWithDatabaseNames", "description": "Frame with database names." }
    941899                ]
    942900            }

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r104935 r104938  
    5353#include "InspectorFrontend.h"
    5454#include "InspectorFrontendClient.h"
    55 #include "InspectorIndexedDBAgent.h"
    5655#include "InspectorInstrumentation.h"
    5756#include "InspectorMemoryAgent.h"
    … …  
    10099#endif
    101100
    102 #if ENABLE(INDEXED_DATABASE)
    103     m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent));
    104 #endif
    105 
    106101#if ENABLE(FILE_SYSTEM)
    107102    m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get(), m_state.get()));

  • trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

    r104935 r104938  
    692692    frameObject->setString("url", frame->document()->url().string());
    693693    frameObject->setString("loaderId", loaderId(frame->loader()->documentLoader()));
    694     frameObject->setString("securityOrigin", frame->document()->securityOrigin()->toString());
    695694    frameObject->setString("mimeType", frame->loader()->documentLoader()->responseMIMEType());
    696695

  • trunk/Source/WebCore/inspector/compile-front-end.sh

    r104935 r104938  
    4646        --js Source/WebCore/inspector/front-end/HandlerRegistry.js \
    4747        --js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \
    48     --module jsmodule_sdk:30:jsmodule_common \
     48    --module jsmodule_sdk:29:jsmodule_common \
    4949        --js Source/WebCore/inspector/front-end/InspectorBackend.js \
    5050        --js Source/WebCore/inspector/front-end/ApplicationCacheModel.js \
    … …  
    6464        --js Source/WebCore/inspector/front-end/DebuggerPresentationModel.js \
    6565        --js Source/WebCore/inspector/front-end/HAREntry.js \
    66         --js Source/WebCore/inspector/front-end/IndexedDBModel.js \
    6766        --js Source/WebCore/inspector/front-end/NetworkLog.js \
    6867        --js Source/WebCore/inspector/front-end/Placard.js \

  • trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js

    r104935 r104938  
    412412    this._name = payload.name;
    413413    this._url = payload.url;
    414     this._securityOrigin = payload.securityOrigin;
    415414    this._mimeType = payload.mimeType;
    416415
    … …  
    431430WebInspector.ResourceTreeFrame.prototype = {
    432431    /**
    433      * @type {string}
     432     * @return {string}
    434433     */
    435434    get id()
    … …  
    439438
    440439    /**
    441      * @type {string}
     440     * @return {string}
    442441     */
    443442    get name()
    … …  
    447446
    448447    /**
    449      * @type {string}
     448     * @return {string}
    450449     */
    451450    get url()
    … …  
    455454
    456455    /**
    457      * @type {string}
    458      */
    459     get securityOrigin()
    460     {
    461         return this._securityOrigin;
    462     },
    463 
    464     /**
    465      * @type {string}
     456     * @return {string}
    466457     */
    467458    get loaderId()
    … …  
    471462
    472463    /**
    473      * @type {WebInspector.ResourceTreeFrame}
     464     * @return {WebInspector.ResourceTreeFrame}
    474465     */
    475466    get parentFrame()
    … …  
    479470
    480471    /**
    481      * @type {Array.<WebInspector.ResourceTreeFrame>}
     472     * @return {Array.<WebInspector.ResourceTreeFrame>}
    482473     */
    483474    get childFrames()
    … …  
    502493        this._name = framePayload.name;
    503494        this._url = framePayload.url;
    504         this._securityOrigin = framePayload.securityOrigin;
    505495        this._mimeType = framePayload.mimeType;
    506496
    … …  
    513503
    514504    /**
    515      * @type {WebInspector.Resource}
     505     * @return {WebInspector.Resource}
    516506     */
    517507    get mainResource()

  • trunk/Source/WebCore/inspector/front-end/WebKit.qrc

    r104935 r104938  
    6666    <file>HelpScreen.js</file>
    6767    <file>ImageView.js</file>
    68     <file>IndexedDBModel.js</file>
    6968    <file>InjectedFakeWorker.js</file>
    7069    <file>inspector.js</file>

  • trunk/Source/WebCore/inspector/front-end/inspector.html

    r104935 r104938  
    8282    <script type="text/javascript" src="ApplicationCacheModel.js"></script>
    8383    <script type="text/javascript" src="ApplicationCacheItemsView.js"></script>
    84     <script type="text/javascript" src="IndexedDBModel.js"></script>
    8584    <script type="text/javascript" src="Script.js"></script>
    8685    <script type="text/javascript" src="SidebarPane.js"></script>
Note: See TracChangeset for help on using the changeset viewer.