| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1192 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); | 1192 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1193 | 1193 |
| 1194 DocumentLifecycle::DisallowTransitionScope disallowTransition(frame()->docum
ent()->lifecycle()); | 1194 DocumentLifecycle::DisallowTransitionScope disallowTransition(frame()->docum
ent()->lifecycle()); |
| 1195 | 1195 |
| 1196 return plainText(webRange.createEphemeralRange(frame()), TextIteratorEmitsOb
jectReplacementCharacter); | 1196 return plainText(webRange.createEphemeralRange(frame()), TextIteratorEmitsOb
jectReplacementCharacter); |
| 1197 } | 1197 } |
| 1198 | 1198 |
| 1199 void WebLocalFrameImpl::moveRangeSelectionExtent(const WebPoint& point) | 1199 void WebLocalFrameImpl::moveRangeSelectionExtent(const WebPoint& point) |
| 1200 { | 1200 { |
| 1201 TRACE_EVENT0("blink", "WebLocalFrameImpl::moveRangeSelectionExtent"); | 1201 TRACE_EVENT0("blink", "WebLocalFrameImpl::moveRangeSelectionExtent"); |
| 1202 |
| 1203 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 1204 // needs to be audited. See http://crbug.com/590369 for more details. |
| 1205 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1206 |
| 1202 frame()->selection().moveRangeSelectionExtent(frame()->view()->viewportToCon
tents(point)); | 1207 frame()->selection().moveRangeSelectionExtent(frame()->view()->viewportToCon
tents(point)); |
| 1203 } | 1208 } |
| 1204 | 1209 |
| 1205 void WebLocalFrameImpl::moveRangeSelection(const WebPoint& baseInViewport, const
WebPoint& extentInViewport, WebFrame::TextGranularity granularity) | 1210 void WebLocalFrameImpl::moveRangeSelection(const WebPoint& baseInViewport, const
WebPoint& extentInViewport, WebFrame::TextGranularity granularity) |
| 1206 { | 1211 { |
| 1207 TRACE_EVENT0("blink", "WebLocalFrameImpl::moveRangeSelection"); | 1212 TRACE_EVENT0("blink", "WebLocalFrameImpl::moveRangeSelection"); |
| 1208 blink::TextGranularity blinkGranularity = blink::CharacterGranularity; | 1213 blink::TextGranularity blinkGranularity = blink::CharacterGranularity; |
| 1209 if (granularity == WebFrame::WordGranularity) | 1214 if (granularity == WebFrame::WordGranularity) |
| 1210 blinkGranularity = blink::WordGranularity; | 1215 blinkGranularity = blink::WordGranularity; |
| 1211 frame()->selection().moveRangeSelection( | 1216 frame()->selection().moveRangeSelection( |
| (...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2243 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2248 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2244 } else if (metric == "wasAlternateProtocolAvailable") { | 2249 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2245 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2250 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2246 } else if (metric == "connectionInfo") { | 2251 } else if (metric == "connectionInfo") { |
| 2247 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2252 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2248 } | 2253 } |
| 2249 UseCounter::count(frame(), feature); | 2254 UseCounter::count(frame(), feature); |
| 2250 } | 2255 } |
| 2251 | 2256 |
| 2252 } // namespace blink | 2257 } // namespace blink |
| OLD | NEW |