summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 10:40:56 +0000
committeryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-19 10:40:56 +0000
commita45ca532576fa7241db6c83c018f4ef6378633b1 (patch)
treec158d6db694f0ba482d8d6c82d325f0585852239 /webkit
parent5c8bf1238c1c54c3e27025a3c7cc2e6e4b86915e (diff)
downloadchromium_src-a45ca532576fa7241db6c83c018f4ef6378633b1.zip
chromium_src-a45ca532576fa7241db6c83c018f4ef6378633b1.tar.gz
chromium_src-a45ca532576fa7241db6c83c018f4ef6378633b1.tar.bz2
DevTools: add devtools.css to webkit.gyp. It should have been added as part of http://codereview.chromium.org/125116
Review URL: http://codereview.chromium.org/131103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/devtools.css2
-rw-r--r--webkit/glue/devtools/js/devtools.js4
-rw-r--r--webkit/webkit.gyp1
3 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/devtools/js/devtools.css b/webkit/glue/devtools/js/devtools.css
index 2dcf359..33659df 100644
--- a/webkit/glue/devtools/js/devtools.css
+++ b/webkit/glue/devtools/js/devtools.css
@@ -1,3 +1,3 @@
#scripts-files option.injected {
- background-color: rgb(250, 240, 240);
+ color: rgb(70, 134, 240);
} \ No newline at end of file
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index 7e03b06..9ed02bc 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -923,8 +923,8 @@ Object.sortedProperties = function(obj) {
var result = original.apply(this, arguments);
var debuggerAgent = devtools.tools.getDebuggerAgent();
var type = debuggerAgent.getScriptContextType(script.sourceID);
- if (type == 'injected') {
- var option = script.filesSelectOption;
+ var option = script.filesSelectOption;
+ if (type == 'injected' && option) {
option.addStyleClass('injected');
}
return result;
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 7709396..759aa14 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4670,6 +4670,7 @@
'files': [
'glue/devtools/js/base.js',
'glue/devtools/js/debugger_agent.js',
+ 'glue/devtools/js/devtools.css',
'glue/devtools/js/devtools.html',
'glue/devtools/js/devtools.js',
'glue/devtools/js/devtools_callback.js',