Changeset 104935 in webkit
- Timestamp:
- Jan 13, 2012 7:08:28 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r104919 r104935 896 896 inspector/InspectorFrontendClientLocal.cpp 897 897 inspector/InspectorFrontendHost.cpp 898 inspector/InspectorIndexedDBAgent.cpp 898 899 inspector/InspectorInstrumentation.cpp 899 900 inspector/InspectorMemoryAgent.cpp -
trunk/Source/WebCore/ChangeLog
r104934 r104935 1 2012-01-13 Vsevolod Vlasov <vsevik@chromium.org> 2 3 Web Inspector: [InspectorIndexedDB] Add InspectorIndexedDBAgent and IndexedDBModel, pass database names to inspector. 4 https://bugs.webkit.org/show_bug.cgi?id=76264 5 6 Reviewed by Pavel Feldman. 7 8 * CMakeLists.txt: 9 * WebCore.gypi: 10 * WebCore.vcproj/WebCore.vcproj: 11 * inspector/CodeGeneratorInspector.py: 12 * inspector/Inspector.json: 13 * inspector/InspectorController.cpp: 14 (WebCore::InspectorController::InspectorController): 15 * inspector/InspectorIndexedDBAgent.cpp: Added. 16 (WebCore::InspectorIndexedDBAgent::FrontendProvider::create): 17 (WebCore::InspectorIndexedDBAgent::FrontendProvider::~FrontendProvider): 18 (WebCore::InspectorIndexedDBAgent::FrontendProvider::frontend): 19 (WebCore::InspectorIndexedDBAgent::FrontendProvider::clearFrontend): 20 (WebCore::InspectorIndexedDBAgent::FrontendProvider::FrontendProvider): 21 (WebCore::InspectorIndexedDBAgent::InspectorIndexedDBAgent): 22 (WebCore::InspectorIndexedDBAgent::~InspectorIndexedDBAgent): 23 (WebCore::InspectorIndexedDBAgent::setFrontend): 24 (WebCore::InspectorIndexedDBAgent::clearFrontend): 25 (WebCore::InspectorIndexedDBAgent::restore): 26 (WebCore::InspectorIndexedDBAgent::enable): 27 (WebCore::InspectorIndexedDBAgent::disable): 28 (WebCore::InspectorIndexedDBAgent::requestDatabaseNamesForFrame): 29 * inspector/InspectorIndexedDBAgent.h: Added. 30 (WebCore::InspectorIndexedDBAgent::create): 31 * inspector/InspectorPageAgent.cpp: 32 (WebCore::InspectorPageAgent::buildObjectForFrame): 33 * inspector/compile-front-end.sh: 34 * inspector/front-end/IndexedDBModel.js: Added. 35 * inspector/front-end/ResourceTreeModel.js: 36 (WebInspector.ResourceTreeFrame): 37 (WebInspector.ResourceTreeFrame.prototype.get securityOrigin): 38 (WebInspector.ResourceTreeFrame.prototype._navigate): 39 * inspector/front-end/WebKit.qrc: 40 * inspector/front-end/inspector.html: 41 1 42 2012-01-13 Simon Hausmann <simon.hausmann@nokia.com> 2 43 -
trunk/Source/WebCore/WebCore.gypi
r104919 r104935 2779 2779 'inspector/InspectorFrontendHost.cpp', 2780 2780 'inspector/InspectorFrontendHost.h', 2781 'inspector/InspectorIndexedDBAgent.cpp', 2782 'inspector/InspectorIndexedDBAgent.h', 2781 2783 'inspector/InspectorInstrumentation.cpp', 2782 2784 'inspector/InspectorInstrumentation.h', … … 6467 6469 'inspector/front-end/HelpScreen.js', 6468 6470 'inspector/front-end/ImageView.js', 6471 'inspector/front-end/IndexedDBModel.js', 6469 6472 'inspector/front-end/InspectorBackend.js', 6470 6473 'inspector/front-end/InspectorFrontendAPI.js', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r104919 r104935 71407 71407 </File> 71408 71408 <File 71409 RelativePath="..\inspector\InspectorIndexedDBAgent.cpp" 71410 > 71411 </File> 71412 <File 71413 RelativePath="..\inspector\InspectorIndexedDBAgent.h" 71414 > 71415 </File> 71416 <File 71409 71417 RelativePath="..\inspector\InspectorInstrumentation.cpp" 71410 71418 > … … 71903 71911 <File 71904 71912 RelativePath="..\inspector\front-end\ImageView.js" 71913 > 71914 </File> 71915 <File 71916 RelativePath="..\inspector\front-end\IndexedDBModel.js" 71905 71917 > 71906 71918 </File> -
trunk/Source/WebCore/inspector/CodeGeneratorInspector.py
r104833 r104935 44 44 "DOMDebugger": "JAVASCRIPT_DEBUGGER", 45 45 "FileSystem": "FILE_SYSTEM", 46 "IndexedDB": "INDEXED_DATABASE", 46 47 "Profiler": "JAVASCRIPT_DEBUGGER", 47 48 "Worker": "WORKERS", -
trunk/Source/WebCore/inspector/Inspector.json
r104713 r104935 109 109 { "name": "name", "type": "string", "optional": true, "description": "Frame's name as specified in the tag." }, 110 110 { "name": "url", "type": "string", "description": "Frame document's URL." }, 111 { "name": "securityOrigin", "type": "string", "optional": true, "description": "Frame document's security origin." }, 111 112 { "name": "mimeType", "type": "string", "description": "Frame document's mimeType as determined by the browser." } 112 113 ], … … 897 898 { "name": "transactionId", "type": "integer" }, 898 899 { "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." } 899 941 ] 900 942 } -
trunk/Source/WebCore/inspector/InspectorController.cpp
r103992 r104935 53 53 #include "InspectorFrontend.h" 54 54 #include "InspectorFrontendClient.h" 55 #include "InspectorIndexedDBAgent.h" 55 56 #include "InspectorInstrumentation.h" 56 57 #include "InspectorMemoryAgent.h" … … 99 100 #endif 100 101 102 #if ENABLE(INDEXED_DATABASE) 103 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent)); 104 #endif 105 101 106 #if ENABLE(FILE_SYSTEM) 102 107 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get(), m_state.get())); -
trunk/Source/WebCore/inspector/InspectorPageAgent.cpp
r103389 r104935 692 692 frameObject->setString("url", frame->document()->url().string()); 693 693 frameObject->setString("loaderId", loaderId(frame->loader()->documentLoader())); 694 frameObject->setString("securityOrigin", frame->document()->securityOrigin()->toString()); 694 695 frameObject->setString("mimeType", frame->loader()->documentLoader()->responseMIMEType()); 695 696 -
trunk/Source/WebCore/inspector/compile-front-end.sh
r103803 r104935 46 46 --js Source/WebCore/inspector/front-end/HandlerRegistry.js \ 47 47 --js Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js \ 48 --module jsmodule_sdk: 29:jsmodule_common \48 --module jsmodule_sdk:30:jsmodule_common \ 49 49 --js Source/WebCore/inspector/front-end/InspectorBackend.js \ 50 50 --js Source/WebCore/inspector/front-end/ApplicationCacheModel.js \ … … 64 64 --js Source/WebCore/inspector/front-end/DebuggerPresentationModel.js \ 65 65 --js Source/WebCore/inspector/front-end/HAREntry.js \ 66 --js Source/WebCore/inspector/front-end/IndexedDBModel.js \ 66 67 --js Source/WebCore/inspector/front-end/NetworkLog.js \ 67 68 --js Source/WebCore/inspector/front-end/Placard.js \ -
trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js
r103759 r104935 412 412 this._name = payload.name; 413 413 this._url = payload.url; 414 this._securityOrigin = payload.securityOrigin; 414 415 this._mimeType = payload.mimeType; 415 416 … … 430 431 WebInspector.ResourceTreeFrame.prototype = { 431 432 /** 432 * @ return{string}433 * @type {string} 433 434 */ 434 435 get id() … … 438 439 439 440 /** 440 * @ return{string}441 * @type {string} 441 442 */ 442 443 get name() … … 446 447 447 448 /** 448 * @ return{string}449 * @type {string} 449 450 */ 450 451 get url() … … 454 455 455 456 /** 456 * @return {string} 457 * @type {string} 458 */ 459 get securityOrigin() 460 { 461 return this._securityOrigin; 462 }, 463 464 /** 465 * @type {string} 457 466 */ 458 467 get loaderId() … … 462 471 463 472 /** 464 * @ return{WebInspector.ResourceTreeFrame}473 * @type {WebInspector.ResourceTreeFrame} 465 474 */ 466 475 get parentFrame() … … 470 479 471 480 /** 472 * @ return{Array.<WebInspector.ResourceTreeFrame>}481 * @type {Array.<WebInspector.ResourceTreeFrame>} 473 482 */ 474 483 get childFrames() … … 493 502 this._name = framePayload.name; 494 503 this._url = framePayload.url; 504 this._securityOrigin = framePayload.securityOrigin; 495 505 this._mimeType = framePayload.mimeType; 496 506 … … 503 513 504 514 /** 505 * @ return{WebInspector.Resource}515 * @type {WebInspector.Resource} 506 516 */ 507 517 get mainResource() -
trunk/Source/WebCore/inspector/front-end/WebKit.qrc
r103803 r104935 66 66 <file>HelpScreen.js</file> 67 67 <file>ImageView.js</file> 68 <file>IndexedDBModel.js</file> 68 69 <file>InjectedFakeWorker.js</file> 69 70 <file>inspector.js</file> -
trunk/Source/WebCore/inspector/front-end/inspector.html
r103803 r104935 82 82 <script type="text/javascript" src="ApplicationCacheModel.js"></script> 83 83 <script type="text/javascript" src="ApplicationCacheItemsView.js"></script> 84 <script type="text/javascript" src="IndexedDBModel.js"></script> 84 85 <script type="text/javascript" src="Script.js"></script> 85 86 <script type="text/javascript" src="SidebarPane.js"></script>
Note: See TracChangeset
for help on using the changeset viewer.