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