Diff
Modified: trunk/Source/WebCore/ChangeLog (132086 => 132087)
--- trunk/Source/WebCore/ChangeLog 2012-10-22 16:56:50 UTC (rev 132086)
+++ trunk/Source/WebCore/ChangeLog 2012-10-22 17:05:53 UTC (rev 132087)
@@ -1,3 +1,51 @@
+2012-10-22 Jan Keromnes <j...@linux.com>
+
+ Moved cmdevtools.js to folder cm/
+
+ Web Inspector: Move file `cmdevtools.css` to `cm/`
+ https://bugs.webkit.org/show_bug.cgi?id=99956
+
+ Reviewed by Pavel Feldman.
+
+ The file cmdevtools.js belongs to the CodeMirror editor experiment in cm/.
+
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * inspector/front-end/WebKit.qrc:
+ * inspector/front-end/cm/cmdevtools.css: Renamed from Source/WebCore/inspector/front-end/cmdevtools.css.
+ (.CodeMirror):
+ (.CodeMirror-scroll):
+ (.cm-highlight):
+ (@-webkit-keyframes fadeout):
+ (to):
+ (.cm-breakpoint):
+ (.cm-breakpoint-disabled):
+ (.cm-breakpoint-conditional):
+ (.cm-execution-line):
+ (.cm-s-web-inspector-js span.cm-keyword):
+ (.cm-s-web-inspector-js span.cm-number):
+ (.cm-s-web-inspector-js span.cm-comment):
+ (.cm-s-web-inspector-js span.cm-string):
+ (.cm-s-web-inspector-js span.cm-string-2):
+ (.cm-s-web-inspector-css span.cm-keyword):
+ (.cm-s-web-inspector-css span.cm-number):
+ (.cm-s-web-inspector-css span.cm-comment):
+ (.cm-s-web-inspector-css span.cm-string):
+ (.cm-s-web-inspector-css span.cm-string-2):
+ (.cm-s-web-inspector-css span.cm-link):
+ (.cm-s-web-inspector-css span.cm-variable):
+ (.cm-s-web-inspector-html span.cm-meta):
+ (.cm-s-web-inspector-html span.cm-comment):
+ (.cm-s-web-inspector-html span.cm-string):
+ (.cm-s-web-inspector-html span.cm-tag):
+ (.cm-s-web-inspector-html span.cm-attribute):
+ (.cm-s-web-inspector-html span.cm-link):
+ (.webkit-html-message-bubble):
+ (.webkit-html-warning-message):
+ (.webkit-html-error-message):
+ (.webkit-html-message-line):
+ (.webkit-html-message-line-hover):
+
2012-10-22 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Prepare mappings to moving uiSourceCodes creation out of them to workspace.
Modified: trunk/Source/WebCore/WebCore.gypi (132086 => 132087)
--- trunk/Source/WebCore/WebCore.gypi 2012-10-22 16:56:50 UTC (rev 132086)
+++ trunk/Source/WebCore/WebCore.gypi 2012-10-22 17:05:53 UTC (rev 132087)
@@ -6510,9 +6510,9 @@
'webinspector_standalone_css_files': [
'inspector/front-end/auditsPanel.css',
'inspector/front-end/breadcrumbList.css',
+ 'inspector/front-end/cm/cmdevtools.css',
'inspector/front-end/cm/codemirror.css',
'inspector/front-end/cssNamedFlows.css',
- 'inspector/front-end/cmdevtools.css',
'inspector/front-end/dataGrid.css',
'inspector/front-end/elementsPanel.css',
'inspector/front-end/filteredItemSelectionDialog.css',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (132086 => 132087)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-10-22 16:56:50 UTC (rev 132086)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-10-22 17:05:53 UTC (rev 132087)
@@ -76214,6 +76214,10 @@
>
</File>
<File
+ RelativePath="..\inspector\front-end\cm\cmdevtools.css"
+ >
+ </File>
+ <File
RelativePath="..\inspector\front-end\cm\codemirror.css"
>
</File>
@@ -76238,10 +76242,6 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\cmdevtools.css"
- >
- </File>
- <File
RelativePath="..\inspector\front-end\Database.js"
>
</File>
Modified: trunk/Source/WebCore/inspector/front-end/WebKit.qrc (132086 => 132087)
--- trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-10-22 16:56:50 UTC (rev 132086)
+++ trunk/Source/WebCore/inspector/front-end/WebKit.qrc 2012-10-22 17:05:53 UTC (rev 132087)
@@ -36,6 +36,7 @@
<file>CSSNamedFlowView.js</file>
<file>CSSSelectorProfileView.js</file>
<file>CSSStyleModel.js</file>
+ <file>cm/cmdevtools.css</file>
<file>cm/codemirror.css</file>
<file>cm/codemirror.js</file>
<file>cm/css.js</file>
@@ -220,7 +221,6 @@
<file>canvasProfiler.css</file>
<file>cssNamedFlows.css</file>
<file>dataGrid.css</file>
- <file>cmdevtools.css</file>
<file>dialog.css</file>
<file>elementsPanel.css</file>
<file>filteredItemSelectionDialog.css</file>
Copied: trunk/Source/WebCore/inspector/front-end/cm/cmdevtools.css (from rev 132086, trunk/Source/WebCore/inspector/front-end/cmdevtools.css) (0 => 132087)
--- trunk/Source/WebCore/inspector/front-end/cm/cmdevtools.css (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/cm/cmdevtools.css 2012-10-22 17:05:53 UTC (rev 132087)
@@ -0,0 +1,85 @@
+.CodeMirror {
+ line-height: 1.2em !important;
+}
+.CodeMirror-scroll {
+ height: 100% !important;
+}
+
+.cm-highlight {
+ -webkit-animation: "fadeout" 2s 0s;
+}
+@-webkit-keyframes fadeout {
+ from {background-color: rgb(255, 255, 120); }
+ to { background-color: white; }
+}
+.cm-breakpoint {
+ color: white !important;
+ margin-right: -8px !important;
+ margin-left: -6px !important;
+ border-width: 0 8px 0px 2px !important;
+ -webkit-border-image: url(Images/breakpointBorder.png) 1 14 1 2;
+}
+.cm-breakpoint-disabled {
+ opacity: 0.5;
+}
+.cm-breakpoint-conditional {
+ -webkit-border-image: url(Images/breakpointConditionalBorder.png) 1 14 1 2;
+}
+.cm-execution-line {
+ background-color: rgb(171, 191, 254) !important;
+ outline: 1px solid rgb(64, 115, 244);
+}
+
+.cm-s-web-inspector-js span.cm-keyword {color: rgb(170, 13, 145);}
+.cm-s-web-inspector-js span.cm-number {color: rgb(28, 0, 207);}
+.cm-s-web-inspector-js span.cm-comment {color: rgb(0, 116, 0);}
+.cm-s-web-inspector-js span.cm-string {color: rgb(196, 26, 22);}
+.cm-s-web-inspector-js span.cm-string-2 {color: rgb(196, 26, 22);}
+
+.cm-s-web-inspector-css span.cm-keyword { color: rgb(7, 144, 154);}
+.cm-s-web-inspector-css span.cm-number {color: rgb(50, 0, 255);}
+.cm-s-web-inspector-css span.cm-comment {color: rgb(0, 116, 0);}
+.cm-s-web-inspector-css span.cm-meta {color: rgb(200, 0, 0);}
+.cm-s-web-inspector-css span.cm-atom {color: rgb(7, 144, 154);}
+.cm-s-web-inspector-css span.cm-string {color: rgb(7, 144, 154);}
+.cm-s-web-inspector-css span.cm-string-2 {color: rgb(7, 144, 154);}
+.cm-s-web-inspector-css span.cm-link {color: rgb(7, 144, 154);}
+.cm-s-web-inspector-css span.cm-variable {color: rgb(200, 0, 0);}
+
+.cm-s-web-inspector-html span.cm-meta {color: rgb(192, 192, 192);}
+.cm-s-web-inspector-html span.cm-comment {color: rgb(35, 110, 37);}
+.cm-s-web-inspector-html span.cm-string {color: rgb(26, 26, 166);}
+.cm-s-web-inspector-html span.cm-tag {color: rgb(136, 18, 128);}
+.cm-s-web-inspector-html span.cm-attribute {color: rgb(153, 69, 0);}
+.cm-s-web-inspector-html span.cm-link {color: #00e;}
+
+.webkit-html-message-bubble {
+ -webkit-box-shadow: black 0px 2px 5px;
+ -webkit-border-radius: 9px;
+ -webkit-border-fit: lines;
+ font-size: 10px;
+ font-family: Lucida Grande, sans-serif;
+ font-weight: bold;
+ margin: 0px 10px;
+ padding: 0 7px 1px;
+ z-index: 5;
+}
+.webkit-html-warning-message {
+ background-color: rgb(100%, 62%, 42%);
+ border: 2px solid rgb(100%, 52%, 21%);
+}
+.webkit-html-error-message {
+ background-color: rgb(100%, 42%, 42%);
+ border: 2px solid rgb(100%, 31%, 31%);
+}
+.webkit-html-message-line {
+ padding-left: 23px;
+ text-indent: -20px;
+}
+.webkit-html-message-line-hover {
+ padding-left: 23px;
+ text-indent: -20px;
+ white-space: auto;
+ text-overflow: auto;
+ overflow: auto;
+}
Deleted: trunk/Source/WebCore/inspector/front-end/cmdevtools.css (132086 => 132087)
--- trunk/Source/WebCore/inspector/front-end/cmdevtools.css 2012-10-22 16:56:50 UTC (rev 132086)
+++ trunk/Source/WebCore/inspector/front-end/cmdevtools.css 2012-10-22 17:05:53 UTC (rev 132087)
@@ -1,83 +0,0 @@
-.CodeMirror {
- line-height: 1.2em !important;
-}
-.CodeMirror-scroll {
- height: 100% !important;
-}
-
-.cm-highlight {
- -webkit-animation: "fadeout" 2s 0s;
-}
-@-webkit-keyframes fadeout {
- from {background-color: rgb(255, 255, 120); }
- to { background-color: white; }
-}
-.cm-breakpoint {
- color: white !important;
- margin-right: -8px !important;
- margin-left: -6px !important;
- border-width: 0 8px 0px 2px !important;
- -webkit-border-image: url(Images/breakpointBorder.png) 1 14 1 2;
-}
-.cm-breakpoint-disabled {
- opacity: 0.5;
-}
-.cm-breakpoint-conditional {
- -webkit-border-image: url(Images/breakpointConditionalBorder.png) 1 14 1 2;
-}
-.cm-execution-line {
- background-color: rgb(171, 191, 254) !important;
- outline: 1px solid rgb(64, 115, 244);
-}
-
-.cm-s-web-inspector-js span.cm-keyword {color: rgb(170, 13, 145);}
-.cm-s-web-inspector-js span.cm-number {color: rgb(28, 0, 207);}
-.cm-s-web-inspector-js span.cm-comment {color: rgb(0, 116, 0);}
-.cm-s-web-inspector-js span.cm-string {color: rgb(196, 26, 22);}
-.cm-s-web-inspector-js span.cm-string-2 {color: rgb(196, 26, 22);}
-
-.cm-s-web-inspector-css span.cm-keyword { color: rgb(7, 144, 154);}
-.cm-s-web-inspector-css span.cm-number {color: rgb(50, 0, 255);}
-.cm-s-web-inspector-css span.cm-comment {color: rgb(0, 116, 0);}
-.cm-s-web-inspector-css span.cm-string {color: rgb(7, 144, 154);}
-.cm-s-web-inspector-css span.cm-string-2 {color: rgb(7, 144, 154);}
-.cm-s-web-inspector-css span.cm-link {color: rgb(7, 144, 154);}
-.cm-s-web-inspector-css span.cm-variable {color: rgb(200, 0, 0);}
-
-.cm-s-web-inspector-html span.cm-meta {color: rgb(192, 192, 192);}
-.cm-s-web-inspector-html span.cm-comment {color: rgb(35, 110, 37);}
-.cm-s-web-inspector-html span.cm-string {color: rgb(26, 26, 166);}
-.cm-s-web-inspector-html span.cm-tag {color: rgb(136, 18, 128);}
-.cm-s-web-inspector-html span.cm-attribute {color: rgb(153, 69, 0);}
-.cm-s-web-inspector-html span.cm-link {color: #00e;}
-
-.webkit-html-message-bubble {
- -webkit-box-shadow: black 0px 2px 5px;
- -webkit-border-radius: 9px;
- -webkit-border-fit: lines;
- font-size: 10px;
- font-family: Lucida Grande, sans-serif;
- font-weight: bold;
- margin: 0px 10px;
- padding: 0 7px 1px;
- z-index: 5;
-}
-.webkit-html-warning-message {
- background-color: rgb(100%, 62%, 42%);
- border: 2px solid rgb(100%, 52%, 21%);
-}
-.webkit-html-error-message {
- background-color: rgb(100%, 42%, 42%);
- border: 2px solid rgb(100%, 31%, 31%);
-}
-.webkit-html-message-line {
- padding-left: 23px;
- text-indent: -20px;
-}
-.webkit-html-message-line-hover {
- padding-left: 23px;
- text-indent: -20px;
- white-space: auto;
- text-overflow: auto;
- overflow: auto;
-}
