[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 17:50:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit faf0537b314a55f0cbef3daf27adf4ee1ba3519a
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 15:52:26 2010 +0000
2010-11-30 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: do not make helpScreen.css lazily loaded.
https://bugs.webkit.org/show_bug.cgi?id=50304
* inspector/front-end/HelpScreen.js:
(WebInspector.HelpScreen):
(WebInspector.HelpScreen.prototype._onBlur):
* inspector/front-end/inspector.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73021 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a0b3ba5..5d44bf1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: do not make helpScreen.css lazily loaded.
+ https://bugs.webkit.org/show_bug.cgi?id=50304
+
+ * inspector/front-end/HelpScreen.js:
+ (WebInspector.HelpScreen):
+ (WebInspector.HelpScreen.prototype._onBlur):
+ * inspector/front-end/inspector.html:
+
2010-12-01 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/inspector/front-end/HelpScreen.js b/WebCore/inspector/front-end/HelpScreen.js
index cad39d0..a1bbf1e 100644
--- a/WebCore/inspector/front-end/HelpScreen.js
+++ b/WebCore/inspector/front-end/HelpScreen.js
@@ -30,8 +30,6 @@
WebInspector.HelpScreen = function(title)
{
- this._addStyleSheetIfNeeded("helpScreen.css");
-
this._element = document.createElement("div");
this._element.className = "help-window-outer";
this._element.addEventListener("keydown", this._onKeyDown.bind(this), false);
@@ -86,17 +84,5 @@ WebInspector.HelpScreen.prototype = {
// Pretend we're modal, grab focus back if we're still shown.
if (this._isShown)
WebInspector.currentFocusElement = this.contentElement;
- },
-
- _addStyleSheetIfNeeded: function(href)
- {
- if (WebInspector.HelpScreen._styleSheetAdded)
- return;
-
- WebInspector.HelpScreen._styleSheetAdded = true;
- var link = document.head.createChild("link");
- link.type = "text/css";
- link.rel = "stylesheet";
- link.href = href;
}
-};
+}
diff --git a/WebCore/inspector/front-end/inspector.html b/WebCore/inspector/front-end/inspector.html
index 2d47474..67fd081 100644
--- a/WebCore/inspector/front-end/inspector.html
+++ b/WebCore/inspector/front-end/inspector.html
@@ -35,6 +35,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<link rel="stylesheet" type="text/css" href="inspector.css">
<link rel="stylesheet" type="text/css" href="inspectorSyntaxHighlight.css">
<link rel="stylesheet" type="text/css" href="networkPanel.css">
+ <link rel="stylesheet" type="text/css" href="helpScreen.css">
<link rel="stylesheet" type="text/css" href="popover.css">
<link rel="stylesheet" type="text/css" href="textViewer.css">
<script type="text/javascript" src="utilities.js"></script>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list