Diff
Modified: trunk/Source/WebCore/ChangeLog (120710 => 120711)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 14:15:14 UTC (rev 120711)
@@ -1,3 +1,36 @@
+2012-06-19 Peter Wang <[email protected]>
+
+ Remove the function ScriptDebugServer::supportsNativeBreakpoints()
+ https://bugs.webkit.org/show_bug.cgi?id=88759
+
+ Reviewed by Pavel Feldman.
+
+ Since both JSC and V8 support DOM breakpoint now, remove the conditional interface and related code.
+ So there is no new tests.
+
+ * bindings/js/ScriptDebugServer.h:
+ * bindings/v8/ScriptDebugServer.h:
+ * inspector/Inspector.json:
+ * inspector/InspectorDebuggerAgent.cpp:
+ * inspector/InspectorDebuggerAgent.h:
+ (InspectorDebuggerAgent):
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel):
+ (WebInspector.ElementsPanel.prototype.wasShown):
+ (WebInspector.ElementsPanel.prototype._populateContextMenu):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._createTable):
+ (WebInspector.NetworkLogView.prototype.switchToDetailedView):
+ (WebInspector.NetworkLogView.prototype.switchToBriefView):
+ (WebInspector.NetworkDataGridNode.prototype.createCells):
+ (WebInspector.NetworkDataGridNode.prototype.refreshRequest):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype.wasShown):
+ (WebInspector.ScriptsPanel.prototype._clearInterface):
+ * inspector/front-end/Settings.js:
+ * inspector/front-end/inspector.js:
+ (WebInspector.doLoadedDone):
+
2012-06-19 Nikita Vasilyev <[email protected]>
Web Inspector: Make text in WebSocket Frames tab selectable
Modified: trunk/Source/WebCore/bindings/js/ScriptDebugServer.h (120710 => 120711)
--- trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/bindings/js/ScriptDebugServer.h 2012-06-19 14:15:14 UTC (rev 120711)
@@ -86,8 +86,6 @@
void updateCallStack(ScriptValue* callFrame);
bool causesRecompilation() { return true; }
- // FIXME: Need to remove this. Refer to bug: 88759.
- bool supportsNativeBreakpoints() { return true; }
void recompileAllJSFunctionsSoon();
virtual void recompileAllJSFunctions(Timer<ScriptDebugServer>* = 0) = 0;
Modified: trunk/Source/WebCore/bindings/v8/ScriptDebugServer.h (120710 => 120711)
--- trunk/Source/WebCore/bindings/v8/ScriptDebugServer.h 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/bindings/v8/ScriptDebugServer.h 2012-06-19 14:15:14 UTC (rev 120711)
@@ -80,7 +80,6 @@
void updateCallStack(ScriptValue* callFrame);
bool causesRecompilation() { return false; }
- bool supportsNativeBreakpoints() { return true; }
void recompileAllJSFunctionsSoon() { }
void recompileAllJSFunctions(Timer<ScriptDebugServer>* = 0) { }
Modified: trunk/Source/WebCore/inspector/Inspector.json (120710 => 120711)
--- trunk/Source/WebCore/inspector/Inspector.json 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/Inspector.json 2012-06-19 14:15:14 UTC (rev 120711)
@@ -2368,14 +2368,6 @@
"description": "Tells whether enabling debugger causes scripts recompilation."
},
{
- "name": "supportsNativeBreakpoints",
- "returns": [
- { "name": "result", "type": "boolean", "description": "True if debugger supports native breakpoints." }
- ],
- "hidden": true,
- "description": "Tells whether debugger supports native breakpoints."
- },
- {
"name": "enable",
"description": "Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received."
},
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (120710 => 120711)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-06-19 14:15:14 UTC (rev 120711)
@@ -118,11 +118,6 @@
*result = scriptDebugServer().canSetScriptSource();
}
-void InspectorDebuggerAgent::supportsNativeBreakpoints(ErrorString*, bool* result)
-{
- *result = scriptDebugServer().supportsNativeBreakpoints();
-}
-
void InspectorDebuggerAgent::enable(ErrorString*)
{
if (enabled())
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (120710 => 120711)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2012-06-19 14:15:14 UTC (rev 120711)
@@ -67,7 +67,6 @@
virtual void causesRecompilation(ErrorString*, bool*);
virtual void canSetScriptSource(ErrorString*, bool*);
- virtual void supportsNativeBreakpoints(ErrorString*, bool*);
virtual void enable(ErrorString*);
virtual void disable(ErrorString*);
Modified: trunk/Source/WebCore/inspector/front-end/ElementsPanel.js (120710 => 120711)
--- trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -70,8 +70,7 @@
this.sidebarPanes.styles = new WebInspector.StylesSidebarPane(this.sidebarPanes.computedStyle);
this.sidebarPanes.metrics = new WebInspector.MetricsSidebarPane();
this.sidebarPanes.properties = new WebInspector.PropertiesSidebarPane();
- if (Capabilities.nativeInstrumentationEnabled)
- this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
+ this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
this.sidebarPanes.eventListeners = new WebInspector.EventListenersSidebarPane();
this.sidebarPanes.styles._onexpand_ = this.updateStyles.bind(this);
@@ -140,8 +139,7 @@
if (!this.treeOutline.rootDOMNode)
WebInspector.domAgent.requestDocument();
- if (Capabilities.nativeInstrumentationEnabled)
- this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.eventListeners.element);
+ this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.eventListeners.element);
},
willHide: function()
@@ -215,8 +213,7 @@
return;
}
- if (Capabilities.nativeInstrumentationEnabled)
- this.sidebarPanes.domBreakpoints.restoreBreakpoints();
+ this.sidebarPanes.domBreakpoints.restoreBreakpoints();
/**
* @this {WebInspector.ElementsPanel}
@@ -333,12 +330,10 @@
_populateContextMenu: function(contextMenu, node)
{
- if (Capabilities.nativeInstrumentationEnabled) {
- // Add debbuging-related actions
- contextMenu.appendSeparator();
- var pane = this.sidebarPanes.domBreakpoints;
- pane.populateNodeContextMenu(node, contextMenu);
- }
+ // Add debbuging-related actions
+ contextMenu.appendSeparator();
+ var pane = this.sidebarPanes.domBreakpoints;
+ pane.populateNodeContextMenu(node, contextMenu);
},
_getPopoverAnchor: function(element)
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (120710 => 120711)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -138,7 +138,7 @@
_createTable: function()
{
var columns;
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
else
columns = {name: {}, method: {}, status: {}, type: {}, size: {}, time: {}, timeline: {}};
@@ -159,7 +159,7 @@
columns.type.sortable = true;
columns.type.width = "6%";
- if (Capabilities.nativeInstrumentationEnabled) {
+ if (Preferences.displayInitiator) {
columns.initiator.title = WebInspector.UIString("Initiator");
columns.initiator.sortable = true;
columns.initiator.width = "10%";
@@ -177,7 +177,7 @@
columns.timeline.title = "";
columns.timeline.sortable = false;
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
columns.timeline.width = "40%";
else
columns.timeline.width = "50%";
@@ -842,7 +842,7 @@
this._dataGrid.showColumn("method");
this._dataGrid.showColumn("status");
this._dataGrid.showColumn("type");
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
this._dataGrid.showColumn("initiator");
this._dataGrid.showColumn("size");
this._dataGrid.showColumn("time");
@@ -853,11 +853,11 @@
widths.method = 6;
widths.status = 6;
widths.type = 6;
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
widths.initiator = 10;
widths.size = 6;
widths.time = 6;
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
widths.timeline = 40;
else
widths.timeline = 50;
@@ -873,7 +873,7 @@
this._dataGrid.hideColumn("method");
this._dataGrid.hideColumn("status");
this._dataGrid.hideColumn("type");
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
this._dataGrid.hideColumn("initiator");
this._dataGrid.hideColumn("size");
this._dataGrid.hideColumn("time");
@@ -1726,7 +1726,7 @@
this._methodCell = this._createDivInTD("method");
this._statusCell = this._createDivInTD("status");
this._typeCell = this._createDivInTD("type");
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
this._initiatorCell = this._createDivInTD("initiator");
this._sizeCell = this._createDivInTD("size");
this._timeCell = this._createDivInTD("time");
@@ -1820,7 +1820,7 @@
this._refreshStatusCell();
this._refreshTypeCell();
- if (Capabilities.nativeInstrumentationEnabled)
+ if (Preferences.displayInitiator)
this._refreshInitiatorCell();
this._refreshSizeCell();
this._refreshTimeCell();
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (120710 => 120711)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -102,11 +102,9 @@
this.sidebarPanes.callstack = new WebInspector.CallStackSidebarPane();
this.sidebarPanes.scopechain = new WebInspector.ScopeChainSidebarPane();
this.sidebarPanes.jsBreakpoints = new WebInspector._javascript_BreakpointsSidebarPane(WebInspector.breakpointManager, this._showSourceLine.bind(this));
- if (Capabilities.nativeInstrumentationEnabled) {
- this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
- this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
- this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
- }
+ this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane;
+ this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
+ this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
if (Preferences.exposeWorkersInspection && !WebInspector.WorkerManager.isWorkerFrontend()) {
WorkerAgent.setWorkerInspectionEnabled(true);
@@ -216,8 +214,7 @@
wasShown: function()
{
WebInspector.Panel.prototype.wasShown.call(this);
- if (Capabilities.nativeInstrumentationEnabled)
- this._debugSidebarContentsElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.xhrBreakpoints.element);
+ this._debugSidebarContentsElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.xhrBreakpoints.element);
this.sidebarPanes.watchExpressions.show();
this._navigatorController.wasShown();
@@ -659,11 +656,9 @@
this.sidebarPanes.callstack.update(null);
this.sidebarPanes.scopechain.update(null);
this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
- if (Capabilities.nativeInstrumentationEnabled) {
- this.sidebarPanes.domBreakpoints.clearBreakpointHighlight();
- this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();
- this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
- }
+ this.sidebarPanes.domBreakpoints.clearBreakpointHighlight();
+ this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();
+ this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
this._clearCurrentExecutionLine();
this._updateDebuggerButtons();
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (120710 => 120711)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -45,14 +45,14 @@
applicationTitle: "Web Inspector - %s",
showHeapSnapshotObjectsHiddenProperties: false,
showDockToRight: false,
- exposeFileSystemInspection: false
+ exposeFileSystemInspection: false,
+ displayInitiator: false
}
var Capabilities = {
samplingCPUProfiler: false,
debuggerCausesRecompilation: true,
profilerCausesRecompilation: true,
- nativeInstrumentationEnabled: false,
heapProfilerPresent: false,
canOverrideDeviceMetrics: false,
timelineSupportsFrameInstrumentation: false,
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (120710 => 120711)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -396,7 +396,6 @@
WebInspector.WorkerManager.loaded();
DebuggerAgent.causesRecompilation(WebInspector._initializeCapability.bind(WebInspector, "debuggerCausesRecompilation", null));
- DebuggerAgent.supportsNativeBreakpoints(WebInspector._initializeCapability.bind(WebInspector, "nativeInstrumentationEnabled", null));
ProfilerAgent.causesRecompilation(WebInspector._initializeCapability.bind(WebInspector, "profilerCausesRecompilation", null));
ProfilerAgent.isSampling(WebInspector._initializeCapability.bind(WebInspector, "samplingCPUProfiler", null));
ProfilerAgent.hasHeapProfiler(WebInspector._initializeCapability.bind(WebInspector, "heapProfilerPresent", null));
@@ -445,8 +444,7 @@
this.advancedSearchController = new WebInspector.AdvancedSearchController();
this.settingsController = new WebInspector.SettingsController();
- if (Capabilities.nativeInstrumentationEnabled)
- this.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane();
+ this.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane();
this._zoomLevel = WebInspector.settings.zoomLevel.get();
if (this._zoomLevel)
Modified: trunk/Source/WebKit/chromium/ChangeLog (120710 => 120711)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 14:15:14 UTC (rev 120711)
@@ -1,3 +1,12 @@
+2012-06-19 Peter Wang <[email protected]>
+
+ Remove the function ScriptDebugServer::supportsNativeBreakpoints()
+ https://bugs.webkit.org/show_bug.cgi?id=88759
+
+ Reviewed by Pavel Feldman.
+
+ * src/js/DevTools.js:
+
2012-06-19 Yury Semikhatsky <[email protected]>
[Chromium] Web Inspector: remove unnecessary indirection from message loop instrumentation
Modified: trunk/Source/WebKit/chromium/src/js/DevTools.js (120710 => 120711)
--- trunk/Source/WebKit/chromium/src/js/DevTools.js 2012-06-19 14:06:24 UTC (rev 120710)
+++ trunk/Source/WebKit/chromium/src/js/DevTools.js 2012-06-19 14:15:14 UTC (rev 120711)
@@ -42,6 +42,7 @@
Preferences.exposeWorkersInspection = true;
Preferences.showDockToRight = true;
Preferences.exposeFileSystemInspection = true;
+ Preferences.displayInitiator = true;
})();}
function buildPlatformExtensionAPI(extensionInfo)
