| 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 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 | 1390 |
| 1391 WebRect WebLocalFrameImpl::selectionBoundsRect() const | 1391 WebRect WebLocalFrameImpl::selectionBoundsRect() const |
| 1392 { | 1392 { |
| 1393 return hasSelection() ? WebRect(IntRect(frame()->selection().bounds())) : We
bRect(); | 1393 return hasSelection() ? WebRect(IntRect(frame()->selection().bounds())) : We
bRect(); |
| 1394 } | 1394 } |
| 1395 | 1395 |
| 1396 bool WebLocalFrameImpl::selectionStartHasSpellingMarkerFor(int from, int length)
const | 1396 bool WebLocalFrameImpl::selectionStartHasSpellingMarkerFor(int from, int length)
const |
| 1397 { | 1397 { |
| 1398 if (!frame()) | 1398 if (!frame()) |
| 1399 return false; | 1399 return false; |
| 1400 |
| 1401 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 1402 // needs to be audited. See http://crbug.com/590369 for more details. |
| 1403 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1404 |
| 1400 return frame()->spellChecker().selectionStartHasSpellingMarkerFor(from, leng
th); | 1405 return frame()->spellChecker().selectionStartHasSpellingMarkerFor(from, leng
th); |
| 1401 } | 1406 } |
| 1402 | 1407 |
| 1403 WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const | 1408 WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const |
| 1404 { | 1409 { |
| 1405 if (!frame()) | 1410 if (!frame()) |
| 1406 return WebString(); | 1411 return WebString(); |
| 1407 | 1412 |
| 1408 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD
ebugInfo : LayerTreeNormal)); | 1413 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD
ebugInfo : LayerTreeNormal)); |
| 1409 } | 1414 } |
| (...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2235 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2236 } else if (metric == "wasAlternateProtocolAvailable") { | 2241 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2237 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2238 } else if (metric == "connectionInfo") { | 2243 } else if (metric == "connectionInfo") { |
| 2239 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2244 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2240 } | 2245 } |
| 2241 UseCounter::count(frame(), feature); | 2246 UseCounter::count(frame(), feature); |
| 2242 } | 2247 } |
| 2243 | 2248 |
| 2244 } // namespace blink | 2249 } // namespace blink |
| OLD | NEW |