Changeset 54597 in webkit
- Timestamp:
- Feb 10, 2010 7:18:24 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r54596 r54597 1 2010-02-10 Mikhail Naganov <mnaganov@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Remove several #if USE(JSC) branches. Introduce ScriptDebugServer class for 6 making JavaScriptDebugServer engine-agnostic. 7 8 https://bugs.webkit.org/show_bug.cgi?id=34795 9 10 * GNUmakefile.am: 11 * WebCore.gypi: 12 * WebCore.pro: 13 * WebCore.xcodeproj/project.pbxproj: 14 * bindings/js/JSBindingsAllInOne.cpp: 15 * bindings/js/ScriptDebugServer.cpp: Added. 16 (WebCore::ScriptDebugServer::recompileAllJSFunctions): 17 (WebCore::ScriptDebugServer::recompileAllJSFunctionsSoon): 18 * bindings/js/ScriptDebugServer.h: Added. 19 * bindings/v8/ScriptDebugServer.cpp: Added. 20 (WebCore::ScriptDebugServer::recompileAllJSFunctions): 21 (WebCore::ScriptDebugServer::recompileAllJSFunctionsSoon): 22 * bindings/v8/ScriptDebugServer.h: Added. 23 * inspector/InspectorController.cpp: 24 (WebCore::InspectorController::startUserInitiatedProfiling): 25 (WebCore::InspectorController::enableProfiler): 26 (WebCore::InspectorController::disableProfiler): 27 * page/Console.cpp: 28 (WebCore::Console::profile): 29 (WebCore::Console::profileEnd): 30 1 31 2009-10-06 Yongjun Zhang <yongjun.zhang@nokia.com> 2 32 -
trunk/WebCore/GNUmakefile.am
r54427 r54597 478 478 WebCore/bindings/js/ScriptController.cpp \ 479 479 WebCore/bindings/js/ScriptController.h \ 480 WebCore/bindings/js/ScriptDebugServer.cpp \ 481 WebCore/bindings/js/ScriptDebugServer.h \ 480 482 WebCore/bindings/js/ScriptEventListener.cpp \ 481 483 WebCore/bindings/js/ScriptEventListener.h \ -
trunk/WebCore/WebCore.gypi
r54593 r54597 802 802 'bindings/v8/ScriptController.cpp', 803 803 'bindings/v8/ScriptController.h', 804 'bindings/v8/ScriptDebugServer.cpp', 805 'bindings/v8/ScriptDebugServer.h', 804 806 'bindings/v8/ScriptEventListener.cpp', 805 807 'bindings/v8/ScriptEventListener.h', -
trunk/WebCore/WebCore.pro
r54490 r54597 344 344 bindings/js/ScriptCallStack.cpp \ 345 345 bindings/js/ScriptController.cpp \ 346 bindings/js/ScriptDebugServer.cpp \ 346 347 bindings/js/ScriptEventListener.cpp \ 347 348 bindings/js/ScriptFunctionCall.cpp \ -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r54503 r54597 2456 2456 97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 97DD4D850FDF4D6E00ECF9A4 /* XSSAuditor.h */; }; 2457 2457 97EF7DFE107E55B700D7C49C /* ScriptControllerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */; }; 2458 9F6FC1961122E82A00E80196 /* ScriptDebugServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F6FC1941122E82A00E80196 /* ScriptDebugServer.cpp */; }; 2459 9F6FC1971122E82A00E80196 /* ScriptDebugServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F6FC1951122E82A00E80196 /* ScriptDebugServer.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2458 2460 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304C11184B4100AD0126 /* ScriptProfile.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2459 2461 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */; }; … … 7795 7797 97DD4D850FDF4D6E00ECF9A4 /* XSSAuditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSSAuditor.h; sourceTree = "<group>"; }; 7796 7798 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptControllerBase.cpp; sourceTree = "<group>"; }; 7799 9F6FC1941122E82A00E80196 /* ScriptDebugServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptDebugServer.cpp; sourceTree = "<group>"; }; 7800 9F6FC1951122E82A00E80196 /* ScriptDebugServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugServer.h; sourceTree = "<group>"; }; 7797 7801 9F72304C11184B4100AD0126 /* ScriptProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfile.h; sourceTree = "<group>"; }; 7798 7802 9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfiler.cpp; sourceTree = "<group>"; }; … … 14627 14631 93B70D5409EB0C7C009D8468 /* ScriptController.h */, 14628 14632 A83E1C720E49042B00140B9C /* ScriptControllerMac.mm */, 14633 9F6FC1941122E82A00E80196 /* ScriptDebugServer.cpp */, 14634 9F6FC1951122E82A00E80196 /* ScriptDebugServer.h */, 14629 14635 411046400FA222A600BA436A /* ScriptEventListener.cpp */, 14630 14636 4110463F0FA222A600BA436A /* ScriptEventListener.h */, … … 18506 18512 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */, 18507 18513 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */, 18514 9F6FC1971122E82A00E80196 /* ScriptDebugServer.h in Headers */, 18508 18515 ); 18509 18516 runOnlyForDeploymentPostprocessing = 0; … … 20684 20691 B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */, 20685 20692 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */, 20693 9F6FC1961122E82A00E80196 /* ScriptDebugServer.cpp in Sources */, 20686 20694 ); 20687 20695 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/bindings/js/JSBindingsAllInOne.cpp
r54277 r54597 141 141 #include "ScriptController.cpp" 142 142 #include "ScriptControllerWin.cpp" 143 #include "ScriptDebugServer.cpp" 143 144 #include "ScriptEventListener.cpp" 144 145 #include "ScriptFunctionCall.cpp" -
trunk/WebCore/inspector/InspectorController.cpp
r54576 r54597 54 54 #include "HTMLFrameOwnerElement.h" 55 55 #include "HitTestResult.h" 56 #include "InjectedScript.h" 56 57 #include "InjectedScriptHost.h" 57 #include "InjectedScript.h"58 58 #include "InspectorBackend.h" 59 59 #include "InspectorClient.h" … … 73 73 #include "ResourceResponse.h" 74 74 #include "ScriptCallStack.h" 75 #include "ScriptDebugServer.h" 75 76 #include "ScriptFunctionCall.h" 76 77 #include "ScriptObject.h" … … 1430 1431 if (!profilerEnabled()) { 1431 1432 enableProfiler(false, true); 1432 #if USE(JSC) 1433 JavaScriptDebugServer::shared().recompileAllJSFunctions(); 1434 #endif 1433 ScriptDebugServer::recompileAllJSFunctions(); 1435 1434 } 1436 1435 … … 1489 1488 m_profilerEnabled = true; 1490 1489 1491 #if USE(JSC)1492 1490 if (!skipRecompile) 1493 JavaScriptDebugServer::shared().recompileAllJSFunctionsSoon(); 1494 #endif 1491 ScriptDebugServer::recompileAllJSFunctionsSoon(); 1495 1492 1496 1493 if (m_frontend) … … 1508 1505 m_profilerEnabled = false; 1509 1506 1510 #if USE(JSC) 1511 JavaScriptDebugServer::shared().recompileAllJSFunctionsSoon(); 1512 #endif 1507 ScriptDebugServer::recompileAllJSFunctionsSoon(); 1513 1508 1514 1509 if (m_frontend) -
trunk/WebCore/page/Console.cpp
r54417 r54597 321 321 return; 322 322 323 #if ENABLE(INSPECTOR) && USE(JSC)323 #if ENABLE(INSPECTOR) 324 324 InspectorController* controller = page->inspectorController(); 325 325 // FIXME: log a console message when profiling is disabled. … … 330 330 String resolvedTitle = title; 331 331 if (title.isNull()) // no title so give it the next user initiated profile title. 332 #if ENABLE(INSPECTOR) && USE(JSC)332 #if ENABLE(INSPECTOR) 333 333 resolvedTitle = controller->getCurrentUserInitiatedProfileName(true); 334 334 #else … … 338 338 ScriptProfiler::start(callStack->state(), resolvedTitle); 339 339 340 #if ENABLE(INSPECTOR) && USE(JSC)340 #if ENABLE(INSPECTOR) 341 341 const ScriptCallFrame& lastCaller = callStack->at(0); 342 342 controller->addStartProfilingMessageToConsole(resolvedTitle, lastCaller.lineNumber(), lastCaller.sourceURL()); … … 350 350 return; 351 351 352 if (!this->page()) 353 return; 354 355 #if ENABLE(INSPECTOR) && USE(JSC) 352 #if ENABLE(INSPECTOR) 356 353 InspectorController* controller = page->inspectorController(); 357 354 if (!controller->profilerEnabled()) … … 365 362 m_profiles.append(profile); 366 363 367 #if ENABLE(INSPECTOR) && USE(JSC)364 #if ENABLE(INSPECTOR) 368 365 const ScriptCallFrame& lastCaller = callStack->at(0); 369 366 controller->addProfile(profile, lastCaller.lineNumber(), lastCaller.sourceURL());
Note: See TracChangeset
for help on using the changeset viewer.