[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
pfeldman at chromium.org
pfeldman at chromium.org
Fri Feb 26 22:18:42 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a1e87bca94650e7d1048dbe8a3e0e485c0b7c3d6
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 12 13:16:09 2010 +0000
2010-02-12 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: restore highlighting animation, bring back
keyboard navigation, beautify search results.
https://bugs.webkit.org/show_bug.cgi?id=34853
* inspector/front-end/TextViewer.js:
(WebInspector.TextViewer):
(WebInspector.TextViewer.prototype.highlightLine):
* inspector/front-end/textViewer.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54720 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7de2f80..17b8059 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-12 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: restore highlighting animation, bring back
+ keyboard navigation, beautify search results.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34853
+
+ * inspector/front-end/TextViewer.js:
+ (WebInspector.TextViewer):
+ (WebInspector.TextViewer.prototype.highlightLine):
+ * inspector/front-end/textViewer.css:
+
2010-02-12 Anton Muhin <antonm at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/inspector/front-end/TextViewer.js b/WebCore/inspector/front-end/TextViewer.js
index ced7232..096464f 100644
--- a/WebCore/inspector/front-end/TextViewer.js
+++ b/WebCore/inspector/front-end/TextViewer.js
@@ -36,6 +36,7 @@ WebInspector.TextViewer = function(textModel, platform, url)
this.element = document.createElement("div");
this.element.className = "text-editor monospace";
+ this.element.tabIndex = 0;
this.element.addEventListener("scroll", this._scroll.bind(this), false);
@@ -100,7 +101,6 @@ WebInspector.TextViewer.prototype = {
highlightLine: function(lineNumber)
{
- // FIXME: restore animation.
if (typeof this._highlightedLine === "number") {
var chunk = this._makeLineAChunk(this._highlightedLine);
chunk.removeDecoration("webkit-highlighted-line");
diff --git a/WebCore/inspector/front-end/textViewer.css b/WebCore/inspector/front-end/textViewer.css
index 563c61b..af079bc 100644
--- a/WebCore/inspector/front-end/textViewer.css
+++ b/WebCore/inspector/front-end/textViewer.css
@@ -131,9 +131,19 @@
}
.webkit-markup {
+ -webkit-border-radius: 4px;
+ padding: 2px 1px 2px 3px;
+ margin-left: -4px;
+ margin-top: -2px;
+ -webkit-box-shadow: rgba(0, 0, 0, .5) 3px 3px 4px;
background-color: rgb(241, 234, 0);
}
.webkit-highlighted-line .webkit-line-content {
- background-color: rgb(255, 255, 120);
+ -webkit-animation: "fadeout" 2s 0s;
+}
+
+ at -webkit-keyframes fadeout {
+ from {background-color: rgb(255, 255, 120); }
+ to { background-color: white; }
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list