| 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 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 unsigned index, | 1034 unsigned index, |
| 1035 ExceptionState& exceptionState) { | 1035 ExceptionState& exceptionState) { |
| 1036 DocumentMarker* marker = markerAt(node, markerType, index, exceptionState); | 1036 DocumentMarker* marker = markerAt(node, markerType, index, exceptionState); |
| 1037 if (!marker) | 1037 if (!marker) |
| 1038 return String(); | 1038 return String(); |
| 1039 return marker->description(); | 1039 return marker->description(); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 void Internals::addTextMatchMarker(const Range* range, bool isActive) { | 1042 void Internals::addTextMatchMarker(const Range* range, bool isActive) { |
| 1043 DCHECK(range); | 1043 DCHECK(range); |
| 1044 if (!range->ownerDocument().view()) |
| 1045 return; |
| 1046 |
| 1044 range->ownerDocument().updateStyleAndLayoutIgnorePendingStylesheets(); | 1047 range->ownerDocument().updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1045 range->ownerDocument().markers().addTextMatchMarker(EphemeralRange(range), | 1048 range->ownerDocument().markers().addTextMatchMarker(EphemeralRange(range), |
| 1046 isActive); | 1049 isActive); |
| 1047 | 1050 |
| 1048 // This simulates what the production code does after | 1051 // This simulates what the production code does after |
| 1049 // DocumentMarkerController::addTextMatchMarker(). | 1052 // DocumentMarkerController::addTextMatchMarker(). |
| 1050 range->ownerDocument().view()->invalidatePaintForTickmarks(); | 1053 range->ownerDocument().view()->invalidatePaintForTickmarks(); |
| 1051 } | 1054 } |
| 1052 | 1055 |
| 1053 static bool parseColor(const String& value, | 1056 static bool parseColor(const String& value, |
| (...skipping 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3160 | 3163 |
| 3161 void Internals::crash() { | 3164 void Internals::crash() { |
| 3162 CHECK(false) << "Intentional crash"; | 3165 CHECK(false) << "Intentional crash"; |
| 3163 } | 3166 } |
| 3164 | 3167 |
| 3165 void Internals::setIsLowEndDevice(bool isLowEndDevice) { | 3168 void Internals::setIsLowEndDevice(bool isLowEndDevice) { |
| 3166 MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice); | 3169 MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice); |
| 3167 } | 3170 } |
| 3168 | 3171 |
| 3169 } // namespace blink | 3172 } // namespace blink |
| OLD | NEW |