| 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 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1213 if (!editable) | 1213 if (!editable) |
| 1214 return; | 1214 return; |
| 1215 | 1215 |
| 1216 VisiblePosition position = visiblePositionForViewportPoint(pointInViewport); | 1216 VisiblePosition position = visiblePositionForViewportPoint(pointInViewport); |
| 1217 frame()->selection().moveTo(position, UserTriggered); | 1217 frame()->selection().moveTo(position, UserTriggered); |
| 1218 } | 1218 } |
| 1219 | 1219 |
| 1220 bool WebLocalFrameImpl::setEditableSelectionOffsets(int start, int end) | 1220 bool WebLocalFrameImpl::setEditableSelectionOffsets(int start, int end) |
| 1221 { | 1221 { |
| 1222 TRACE_EVENT0("blink", "WebLocalFrameImpl::setEditableSelectionOffsets"); | 1222 TRACE_EVENT0("blink", "WebLocalFrameImpl::setEditableSelectionOffsets"); |
| 1223 |
| 1224 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 1225 // needs to be audited. See http://crbug.com/590369 for more details. |
| 1226 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| 1227 |
| 1223 return frame()->inputMethodController().setEditableSelectionOffsets(PlainTex
tRange(start, end)); | 1228 return frame()->inputMethodController().setEditableSelectionOffsets(PlainTex
tRange(start, end)); |
| 1224 } | 1229 } |
| 1225 | 1230 |
| 1226 bool WebLocalFrameImpl::setCompositionFromExistingText(int compositionStart, int
compositionEnd, const WebVector<WebCompositionUnderline>& underlines) | 1231 bool WebLocalFrameImpl::setCompositionFromExistingText(int compositionStart, int
compositionEnd, const WebVector<WebCompositionUnderline>& underlines) |
| 1227 { | 1232 { |
| 1228 TRACE_EVENT0("blink", "WebLocalFrameImpl::setCompositionFromExistingText"); | 1233 TRACE_EVENT0("blink", "WebLocalFrameImpl::setCompositionFromExistingText"); |
| 1229 if (!frame()->editor().canEdit()) | 1234 if (!frame()->editor().canEdit()) |
| 1230 return false; | 1235 return false; |
| 1231 | 1236 |
| 1232 InputMethodController& inputMethodController = frame()->inputMethodControlle
r(); | 1237 InputMethodController& inputMethodController = frame()->inputMethodControlle
r(); |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2222 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2227 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; |
| 2223 } else if (metric == "wasAlternateProtocolAvailable") { | 2228 } else if (metric == "wasAlternateProtocolAvailable") { |
| 2224 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2229 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; |
| 2225 } else if (metric == "connectionInfo") { | 2230 } else if (metric == "connectionInfo") { |
| 2226 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2231 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2227 } | 2232 } |
| 2228 UseCounter::count(frame(), feature); | 2233 UseCounter::count(frame(), feature); |
| 2229 } | 2234 } |
| 2230 | 2235 |
| 2231 } // namespace blink | 2236 } // namespace blink |
| OLD | NEW |