Diff
Modified: trunk/LayoutTests/ChangeLog (125895 => 125896)
--- trunk/LayoutTests/ChangeLog 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/LayoutTests/ChangeLog 2012-08-17 14:23:30 UTC (rev 125896)
@@ -1,3 +1,15 @@
+2012-08-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r125880.
+ http://trac.webkit.org/changeset/125880
+ https://bugs.webkit.org/show_bug.cgi?id=94347
+
+ Breaks front-end compilation: SourceFrame passed where View is
+ expected. (Requested by pfeldman on #webkit).
+
+ * inspector/debugger/reveal-execution-line.html:
+ * inspector/debugger/source-frame-count.html:
+
2012-08-17 Jan Keromnes <[email protected]>
Web Inspector: SourceFrame shouldn't be a View
Modified: trunk/LayoutTests/inspector/debugger/reveal-execution-line.html (125895 => 125896)
--- trunk/LayoutTests/inspector/debugger/reveal-execution-line.html 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/LayoutTests/inspector/debugger/reveal-execution-line.html 2012-08-17 14:23:30 UTC (rev 125896)
@@ -36,7 +36,7 @@
{
if (executionLineRevealed)
return;
- if (this._textEditor.isShowing()) {
+ if (this.isShowing()) {
executionLineRevealed = true;
maybeNext();
}
Modified: trunk/LayoutTests/inspector/debugger/source-frame-count.html (125895 => 125896)
--- trunk/LayoutTests/inspector/debugger/source-frame-count.html 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/LayoutTests/inspector/debugger/source-frame-count.html 2012-08-17 14:23:30 UTC (rev 125896)
@@ -35,7 +35,7 @@
{
sourceFrameCount += 1;
}
- InspectorTest.addSniffer(WebInspector.TextEditor.prototype, "wasShown", didCreateSourceFrame, true);
+ InspectorTest.addSniffer(WebInspector.SourceFrame.prototype, "wasShown", didCreateSourceFrame, true);
InspectorTest.reloadPage(didReload);
}
Modified: trunk/Source/WebCore/ChangeLog (125895 => 125896)
--- trunk/Source/WebCore/ChangeLog 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/ChangeLog 2012-08-17 14:23:30 UTC (rev 125896)
@@ -1,3 +1,30 @@
+2012-08-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r125880.
+ http://trac.webkit.org/changeset/125880
+ https://bugs.webkit.org/show_bug.cgi?id=94347
+
+ Breaks front-end compilation: SourceFrame passed where View is
+ expected. (Requested by pfeldman on #webkit).
+
+ * inspector/front-end/CodeMirrorTextEditor.js:
+ (WebInspector.CodeMirrorTextEditor.prototype._loadLibraries):
+ * inspector/front-end/DefaultTextEditor.js:
+ (WebInspector.DefaultTextEditor.prototype.wasShown):
+ (WebInspector.DefaultTextEditor.prototype.willHide):
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame):
+ (WebInspector._javascript_SourceFrame.prototype.wasShown):
+ (WebInspector._javascript_SourceFrame.prototype.willHide):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame):
+ (WebInspector.SourceFrame.prototype.wasShown):
+ (WebInspector.SourceFrame.prototype.willHide):
+ * inspector/front-end/TextEditor.js:
+ * inspector/front-end/scriptsPanel.css:
+ (.script-view):
+ (.script-view.visible):
+
2012-08-17 Milian Wolff <[email protected]>
[Qt] QNX build fails due to ctype usage in system headers
Modified: trunk/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/CodeMirrorTextEditor.js 2012-08-17 14:23:30 UTC (rev 125896)
@@ -393,16 +393,6 @@
loadLibrary("_javascript_.js");
loadLibrary("xml.js");
loadLibrary("htmlmixed.js");
- },
-
- wasShown: function()
- {
- this.dispatchEventToListeners(WebInspector.TextEditor.Events.WasShown);
- },
-
- willHide: function()
- {
- this.dispatchEventToListeners(WebInspector.TextEditor.Events.WillHide);
}
}
Modified: trunk/Source/WebCore/inspector/front-end/DefaultTextEditor.js (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/DefaultTextEditor.js 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/DefaultTextEditor.js 2012-08-17 14:23:30 UTC (rev 125896)
@@ -553,8 +553,6 @@
this._boundSelectionChangeListener = this._handleSelectionChange.bind(this);
document.addEventListener("selectionchange", this._boundSelectionChangeListener, false);
-
- this.dispatchEventToListeners(WebInspector.TextEditor.Events.WasShown);
},
_handleFocused: function()
@@ -565,8 +563,6 @@
willHide: function()
{
- this.dispatchEventToListeners(WebInspector.TextEditor.Events.WillHide);
-
document.removeEventListener("selectionchange", this._boundSelectionChangeListener, false);
delete this._boundSelectionChangeListener;
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-08-17 14:23:30 UTC (rev 125896)
@@ -52,7 +52,6 @@
this.textEditor.element.addEventListener("keydown", this._onKeyDown.bind(this), true);
this.textEditor.addEventListener(WebInspector.TextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
- this.textEditor.addEventListener(WebInspector.TextEditor.Events.WillHide, this._popoverHelper.hidePopover.bind(this._popoverHelper));
this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
@@ -64,6 +63,18 @@
}
WebInspector._javascript_SourceFrame.prototype = {
+ // View events
+ wasShown: function()
+ {
+ WebInspector.SourceFrame.prototype.wasShown.call(this);
+ },
+
+ willHide: function()
+ {
+ WebInspector.SourceFrame.prototype.willHide.call(this);
+ this._popoverHelper.hidePopover();
+ },
+
/**
* @return {boolean}
*/
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2012-08-17 14:23:30 UTC (rev 125896)
@@ -29,13 +29,14 @@
*/
/**
+ * @extends {WebInspector.View}
* @constructor
- * @extends {WebInspector.Object}
* @param {WebInspector.ContentProvider} contentProvider
*/
WebInspector.SourceFrame = function(contentProvider)
{
- WebInspector.Object.call(this);
+ WebInspector.View.call(this);
+ this.element.addStyleClass("script-view");
this._url = contentProvider.contentURL();
this._contentProvider = contentProvider;
@@ -47,9 +48,6 @@
else
this._textEditor = new WebInspector.DefaultTextEditor(this._url, textEditorDelegate);
- this._textEditor.addEventListener(WebInspector.TextEditor.Events.WasShown, this._onTextEditorWasShown.bind(this), this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Events.WillHide, this._onTextEditorWillHide.bind(this), this);
-
this._currentSearchResultIndex = -1;
this._searchResults = [];
@@ -61,7 +59,7 @@
this._shortcuts = {};
this._shortcuts[WebInspector.KeyboardShortcut.makeKey("s", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)] = this._commitEditing.bind(this);
- this._textEditor.element.addEventListener("keydown", this._handleKeyDown.bind(this), false);
+ this.element.addEventListener("keydown", this._handleKeyDown.bind(this), false);
}
/**
@@ -94,29 +92,17 @@
}
WebInspector.SourceFrame.prototype = {
- show: function(parent)
+ wasShown: function()
{
- this._textEditor.show(parent);
- },
-
- detach: function()
- {
- this._textEditor.detach();
- },
-
- focus: function()
- {
- this._textEditor.focus();
- },
-
- _onTextEditorWasShown: function()
- {
this._ensureContentLoaded();
+ this._textEditor.show(this.element);
this._wasShownOrLoaded();
},
- _onTextEditorWillHide: function()
+ willHide: function()
{
+ WebInspector.View.prototype.willHide.call(this);
+
this._clearLineHighlight();
this._clearLineToReveal();
},
@@ -666,7 +652,7 @@
}
}
-WebInspector.SourceFrame.prototype.__proto__ = WebInspector.Object.prototype;
+WebInspector.SourceFrame.prototype.__proto__ = WebInspector.View.prototype;
/**
Modified: trunk/Source/WebCore/inspector/front-end/TextEditor.js (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/TextEditor.js 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/TextEditor.js 2012-08-17 14:23:30 UTC (rev 125896)
@@ -35,9 +35,7 @@
WebInspector.TextEditor = function() { };
WebInspector.TextEditor.Events = {
- GutterClick: "gutterClick",
- WasShown: "WasShown",
- WillHide: "WillHide"
+ GutterClick: "gutterClick"
};
WebInspector.TextEditor.prototype = {
Modified: trunk/Source/WebCore/inspector/front-end/scriptsPanel.css (125895 => 125896)
--- trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2012-08-17 14:16:23 UTC (rev 125895)
+++ trunk/Source/WebCore/inspector/front-end/scriptsPanel.css 2012-08-17 14:23:30 UTC (rev 125896)
@@ -199,6 +199,20 @@
left: 0;
}
+.script-view {
+ display: none;
+ overflow: hidden;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+}
+
+.script-view.visible {
+ display: block;
+}
+
.dedicated-worker-item {
margin: 5px 0px 5px 1px;
}
