Changeset 49495 in webkit
- Timestamp:
- Oct 13, 2009 1:26:34 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r49494 r49495 1 2009-10-12 Alexander Pavlov <apavlov@chromium.org> 2 3 Reviewed by Timothy Hatcher. 4 Alter profile link format to enable multiple profile types 5 https://bugs.webkit.org/show_bug.cgi?id=30253 6 7 The new profile URL includes the profile type along with the 8 profile title and uid. 9 10 * inspector/InspectorController.cpp: 11 (WebCore::InspectorController::addProfileFinishedMessageToConsole): 12 (WebCore::InspectorController::addStartProfilingMessageToConsole): 13 * inspector/front-end/inspector.js: 14 (WebInspector.documentClick.followLink): 15 (WebInspector.documentClick): 16 (WebInspector.linkifyStringAsFragment): 17 1 18 2009-10-12 Alexander Pavlov <apavlov@chromium.org> 2 19 -
trunk/WebCore/inspector/InspectorController.cpp
r49327 r49495 108 108 109 109 static const char* const UserInitiatedProfileName = "org.webkit.profiles.user-initiated"; 110 static const char* const CPUProfileType = "CPU"; 110 111 static const char* const resourceTrackingEnabledSettingName = "resourceTrackingEnabled"; 111 112 static const char* const debuggerEnabledSettingName = "debuggerEnabled"; … … 1361 1362 1362 1363 UString message = "Profile \"webkit-profile://"; 1364 message += encodeWithURLEscapeSequences(CPUProfileType); 1365 message += "/"; 1363 1366 message += encodeWithURLEscapeSequences(profile->title()); 1364 message += " /";1367 message += "#"; 1365 1368 message += UString::from(profile->uid()); 1366 1369 message += "\" finished."; … … 1371 1374 { 1372 1375 UString message = "Profile \"webkit-profile://"; 1376 message += encodeWithURLEscapeSequences(CPUProfileType); 1377 message += "/"; 1373 1378 message += encodeWithURLEscapeSequences(title); 1374 message += " /0\" started.";1379 message += "#0\" started."; 1375 1380 addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL); 1376 1381 } -
trunk/WebCore/inspector/front-end/inspector.js
r49493 r49495 555 555 WebInspector.showResourceForURL(anchor.href, anchor.lineNumber, anchor.preferredPanel); 556 556 } else { 557 var profileStringRegEx = new RegExp("webkit-profile://.+/ ([0-9]+)");557 var profileStringRegEx = new RegExp("webkit-profile://.+/.+#([0-9]+)"); 558 558 var profileString = profileStringRegEx.exec(anchor.href); 559 559 if (profileString) … … 1376 1376 container.appendChild(document.createTextNode(nonLink)); 1377 1377 1378 var profileStringRegEx = new RegExp("webkit-profile:// (.+)/[0-9]+");1378 var profileStringRegEx = new RegExp("webkit-profile://.+/(.+)#[0-9]+"); 1379 1379 var profileStringMatches = profileStringRegEx.exec(title); 1380 1380 var profileTitle;
Note: See TracChangeset
for help on using the changeset viewer.