Title: [146614] trunk/Source/WebCore
- Revision
- 146614
- Author
- [email protected]
- Date
- 2013-03-22 08:16:27 -0700 (Fri, 22 Mar 2013)
Log Message
Web Inspector: [Regression] Editor scroll is not restored after inspector reload.
https://bugs.webkit.org/show_bug.cgi?id=113027
Reviewed by Pavel Feldman.
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype.wasShown):
(WebInspector.SourceFrame.prototype._isEditorShowing):
(WebInspector.SourceFrame.prototype._innerHighlightLineIfNeeded):
(WebInspector.SourceFrame.prototype._innerRevealLineIfNeeded):
(WebInspector.SourceFrame.prototype._innerScrollToLineIfNeeded):
(WebInspector.SourceFrame.prototype._innerSetSelectionIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146613 => 146614)
--- trunk/Source/WebCore/ChangeLog 2013-03-22 15:04:10 UTC (rev 146613)
+++ trunk/Source/WebCore/ChangeLog 2013-03-22 15:16:27 UTC (rev 146614)
@@ -1,3 +1,18 @@
+2013-03-22 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] Editor scroll is not restored after inspector reload.
+ https://bugs.webkit.org/show_bug.cgi?id=113027
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.wasShown):
+ (WebInspector.SourceFrame.prototype._isEditorShowing):
+ (WebInspector.SourceFrame.prototype._innerHighlightLineIfNeeded):
+ (WebInspector.SourceFrame.prototype._innerRevealLineIfNeeded):
+ (WebInspector.SourceFrame.prototype._innerScrollToLineIfNeeded):
+ (WebInspector.SourceFrame.prototype._innerSetSelectionIfNeeded):
+
2013-03-22 Allan Sandfeld Jensen <[email protected]>
[Qt] Fix build with OPENCL 1.2
Modified: trunk/Source/WebCore/inspector/front-end/IndexedDBModel.js (146613 => 146614)
--- trunk/Source/WebCore/inspector/front-end/IndexedDBModel.js 2013-03-22 15:04:10 UTC (rev 146613)
+++ trunk/Source/WebCore/inspector/front-end/IndexedDBModel.js 2013-03-22 15:16:27 UTC (rev 146614)
@@ -164,7 +164,8 @@
/**
* @param {WebInspector.IndexedDBModel.DatabaseId} databaseId
- * @param {WebInspector.IndexedDBModel.ObjectStore} objectStore
+ * @param {string} objectStoreName
+ * @param {function()} callback
*/
clearObjectStore: function(databaseId, objectStoreName, callback)
{
Modified: trunk/Source/WebCore/inspector/front-end/IndexedDBViews.js (146613 => 146614)
--- trunk/Source/WebCore/inspector/front-end/IndexedDBViews.js 2013-03-22 15:04:10 UTC (rev 146613)
+++ trunk/Source/WebCore/inspector/front-end/IndexedDBViews.js 2013-03-22 15:16:27 UTC (rev 146614)
@@ -354,7 +354,7 @@
_clearButtonClicked: function(event)
{
- function cleared(result) {
+ function cleared() {
this._clearButton.setEnabled(true);
this._updateData(true);
}
Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (146613 => 146614)
--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2013-03-22 15:04:10 UTC (rev 146613)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2013-03-22 15:16:27 UTC (rev 146614)
@@ -1744,7 +1744,7 @@
_clearObjectStore: function()
{
- function callback(result) {
+ function callback() {
this.update(this._objectStore);
}
this._model.clearObjectStore(this._databaseId, this._objectStore.name, callback.bind(this));
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (146613 => 146614)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2013-03-22 15:04:10 UTC (rev 146613)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2013-03-22 15:16:27 UTC (rev 146614)
@@ -103,9 +103,18 @@
{
this._ensureContentLoaded();
this._textEditor.show(this.element);
+ this._editorAttached = true;
this._wasShownOrLoaded();
},
+ /**
+ * @return {boolean}
+ */
+ _isEditorShowing: function()
+ {
+ return this.isShowing() && this._editorAttached;
+ },
+
willHide: function()
{
WebInspector.View.prototype.willHide.call(this);
@@ -201,7 +210,7 @@
_innerHighlightLineIfNeeded: function()
{
if (typeof this._lineToHighlight === "number") {
- if (this.loaded && this._textEditor.isShowing()) {
+ if (this.loaded && this._isEditorShowing()) {
this._textEditor.highlightLine(this._lineToHighlight);
delete this._lineToHighlight
}
@@ -228,7 +237,7 @@
_innerRevealLineIfNeeded: function()
{
if (typeof this._lineToReveal === "number") {
- if (this.loaded && this._textEditor.isShowing()) {
+ if (this.loaded && this._isEditorShowing()) {
this._textEditor.revealLine(this._lineToReveal);
delete this._lineToReveal
}
@@ -254,9 +263,9 @@
_innerScrollToLineIfNeeded: function()
{
if (typeof this._lineToScrollTo === "number") {
- if (this.loaded && this._textEditor.isShowing()) {
+ if (this.loaded && this._isEditorShowing()) {
this._textEditor.scrollToLine(this._lineToScrollTo);
- delete this._lineToScrollTo
+ delete this._lineToScrollTo;
}
}
},
@@ -277,7 +286,7 @@
_innerSetSelectionIfNeeded: function()
{
- if (this._selectionToSet && this.loaded && this._textEditor.isShowing()) {
+ if (this._selectionToSet && this.loaded && this._isEditorShowing()) {
this._textEditor.setSelection(this._selectionToSet);
delete this._selectionToSet;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
