1 files changed, 18 insertions, 5 deletions
diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/cm/cmdevtools.css b/chromium/third_party/WebKit/Source/devtools/front_end/cm/cmdevtools.css
index 8d9501cd591..68069fc0fe6 100644
--- a/chromium/third_party/WebKit/Source/devtools/front_end/cm/cmdevtools.css
+++ b/chromium/third_party/WebKit/Source/devtools/front_end/cm/cmdevtools.css
@@ -49,10 +49,18 @@
     to { background-color: white; }
 }
 
+.cm-highlight.cm-execution-line {
+  -webkit-animation: "fadeout-execution-line" 1s 0s;
+}
+@-webkit-keyframes fadeout-execution-line {
+    from {background-color: rgb(121, 141, 254); }
+    to { background-color: rgb(171, 191, 254); }
+}
+
 .cm-breakpoint .CodeMirror-linenumber {
   color: white;
   border-width: 1px 4px 1px 1px !important;
-  -webkit-border-image: url(Images/breakpoint2.png) 1 4 1 1;
+  -webkit-border-image: url(Images/breakpoint.png) 1 4 1 1;
   margin: 0px 0px 0px 3px !important;
   padding-right: 3px;
   padding-left: 1px;
@@ -61,15 +69,15 @@
 }
 
 .cm-breakpoint.cm-breakpoint-conditional .CodeMirror-linenumber {
-  -webkit-border-image: url(Images/breakpointConditional2.png) 1 4 1 1;
+  -webkit-border-image: url(Images/breakpointConditional.png) 1 4 1 1;
 }
 
 @media (-webkit-min-device-pixel-ratio: 1.5) {
 .cm-breakpoint .CodeMirror-linenumber {
-  -webkit-border-image: url(Images/breakpoint2_2x.png) 2 8 2 2;
+  -webkit-border-image: url(Images/breakpoint_2x.png) 2 8 2 2;
 }
 .cm-breakpoint.cm-breakpoint-conditional .CodeMirror-linenumber {
-  -webkit-border-image: url(Images/breakpointConditional2_2x.png) 2 8 2 2;
+  -webkit-border-image: url(Images/breakpointConditional_2x.png) 2 8 2 2;
 }
 } /* media */
 
@@ -120,7 +128,7 @@
 }
 
 .cm-execution-line {
-    background-color: rgb(171, 191, 254) !important;
+    background-color: rgb(171, 191, 254);
     outline: 1px solid rgb(64, 115, 244);
 }
 
@@ -234,3 +242,8 @@
     background-color: rgb(100%, 42%, 42%);
     border: 2px solid rgb(100%, 31%, 31%);
 }
+
+/** @see crbug.com/358161 */
+.CodeMirror .CodeMirror-vscrollbar, .CodeMirror .CodeMirror-hscrollbar {
+  -webkit-transform: translateZ(0);
+}