| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1052 range->ownerDocument().updateStyleAndLayoutIgnorePendingStylesheets(); | 1052 range->ownerDocument().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1053 | 1053 |
| 1054 Color underlineColor; | 1054 Color underlineColor; |
| 1055 Color backgroundColor; | 1055 Color backgroundColor; |
| 1056 if (parseColor(underlineColorValue, underlineColor, exceptionState, | 1056 if (parseColor(underlineColorValue, underlineColor, exceptionState, |
| 1057 "Invalid underline color.") && | 1057 "Invalid underline color.") && |
| 1058 parseColor(backgroundColorValue, backgroundColor, exceptionState, | 1058 parseColor(backgroundColorValue, backgroundColor, exceptionState, |
| 1059 "Invalid background color.")) { | 1059 "Invalid background color.")) { |
| 1060 range->ownerDocument().markers().addCompositionMarker( | 1060 range->ownerDocument().markers().addCompositionMarker( |
| 1061 range->startPosition(), range->endPosition(), underlineColor, thick, | 1061 range->startPosition(), range->endPosition(), underlineColor, thick, |
| 1062 backgroundColor); | 1062 backgroundColor, false); |
| 1063 } | 1063 } |
| 1064 } | 1064 } |
| 1065 | 1065 |
| 1066 void Internals::setMarkersActive(Node* node, | 1066 void Internals::setMarkersActive(Node* node, |
| 1067 unsigned startOffset, | 1067 unsigned startOffset, |
| 1068 unsigned endOffset, | 1068 unsigned endOffset, |
| 1069 bool active) { | 1069 bool active) { |
| 1070 DCHECK(node); | 1070 DCHECK(node); |
| 1071 node->document().markers().setMarkersActive(node, startOffset, endOffset, | 1071 node->document().markers().setMarkersActive(node, startOffset, endOffset, |
| 1072 active); | 1072 active); |
| (...skipping 2016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3089 | 3089 |
| 3090 void Internals::crash() { | 3090 void Internals::crash() { |
| 3091 CHECK(false) << "Intentional crash"; | 3091 CHECK(false) << "Intentional crash"; |
| 3092 } | 3092 } |
| 3093 | 3093 |
| 3094 void Internals::setIsLowEndDevice(bool isLowEndDevice) { | 3094 void Internals::setIsLowEndDevice(bool isLowEndDevice) { |
| 3095 MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice); | 3095 MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice); |
| 3096 } | 3096 } |
| 3097 | 3097 |
| 3098 } // namespace blink | 3098 } // namespace blink |
| OLD | NEW |