| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 #include "bindings/core/v8/V8GCController.h" | 102 #include "bindings/core/v8/V8GCController.h" |
| 103 #include "bindings/core/v8/V8PerIsolateData.h" | 103 #include "bindings/core/v8/V8PerIsolateData.h" |
| 104 #include "core/HTMLNames.h" | 104 #include "core/HTMLNames.h" |
| 105 #include "core/dom/Document.h" | 105 #include "core/dom/Document.h" |
| 106 #include "core/dom/DocumentUserGestureToken.h" | 106 #include "core/dom/DocumentUserGestureToken.h" |
| 107 #include "core/dom/IconURL.h" | 107 #include "core/dom/IconURL.h" |
| 108 #include "core/dom/MessagePort.h" | 108 #include "core/dom/MessagePort.h" |
| 109 #include "core/dom/Node.h" | 109 #include "core/dom/Node.h" |
| 110 #include "core/dom/NodeTraversal.h" | 110 #include "core/dom/NodeTraversal.h" |
| 111 #include "core/dom/shadow/ShadowRoot.h" | 111 #include "core/dom/shadow/ShadowRoot.h" |
| 112 #include "core/editing/CompositionUnderlineVectorBuilder.h" |
| 112 #include "core/editing/EditingUtilities.h" | 113 #include "core/editing/EditingUtilities.h" |
| 113 #include "core/editing/Editor.h" | 114 #include "core/editing/Editor.h" |
| 114 #include "core/editing/FindInPageCoordinates.h" | 115 #include "core/editing/FindInPageCoordinates.h" |
| 115 #include "core/editing/FrameSelection.h" | 116 #include "core/editing/FrameSelection.h" |
| 116 #include "core/editing/InputMethodController.h" | 117 #include "core/editing/InputMethodController.h" |
| 117 #include "core/editing/PlainTextRange.h" | 118 #include "core/editing/PlainTextRange.h" |
| 118 #include "core/editing/TextAffinity.h" | 119 #include "core/editing/TextAffinity.h" |
| 119 #include "core/editing/iterators/TextIterator.h" | 120 #include "core/editing/iterators/TextIterator.h" |
| 120 #include "core/editing/markers/DocumentMarkerController.h" | 121 #include "core/editing/markers/DocumentMarkerController.h" |
| 121 #include "core/editing/serializers/Serialization.h" | 122 #include "core/editing/serializers/Serialization.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 #include "public/web/WebNode.h" | 216 #include "public/web/WebNode.h" |
| 216 #include "public/web/WebPerformance.h" | 217 #include "public/web/WebPerformance.h" |
| 217 #include "public/web/WebPlugin.h" | 218 #include "public/web/WebPlugin.h" |
| 218 #include "public/web/WebPrintParams.h" | 219 #include "public/web/WebPrintParams.h" |
| 219 #include "public/web/WebPrintPresetOptions.h" | 220 #include "public/web/WebPrintPresetOptions.h" |
| 220 #include "public/web/WebRange.h" | 221 #include "public/web/WebRange.h" |
| 221 #include "public/web/WebScriptSource.h" | 222 #include "public/web/WebScriptSource.h" |
| 222 #include "public/web/WebSerializedScriptValue.h" | 223 #include "public/web/WebSerializedScriptValue.h" |
| 223 #include "public/web/WebTreeScopeType.h" | 224 #include "public/web/WebTreeScopeType.h" |
| 224 #include "skia/ext/platform_canvas.h" | 225 #include "skia/ext/platform_canvas.h" |
| 225 #include "web/CompositionUnderlineVectorBuilder.h" | |
| 226 #include "web/RemoteFrameOwner.h" | 226 #include "web/RemoteFrameOwner.h" |
| 227 #include "web/SharedWorkerRepositoryClientImpl.h" | 227 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 228 #include "web/TextCheckerClientImpl.h" | 228 #include "web/TextCheckerClientImpl.h" |
| 229 #include "web/TextFinder.h" | 229 #include "web/TextFinder.h" |
| 230 #include "web/WebDevToolsAgentImpl.h" | 230 #include "web/WebDevToolsAgentImpl.h" |
| 231 #include "web/WebFrameWidgetImpl.h" | 231 #include "web/WebFrameWidgetImpl.h" |
| 232 #include "web/WebPluginContainerImpl.h" | 232 #include "web/WebPluginContainerImpl.h" |
| 233 #include "web/WebRemoteFrameImpl.h" | 233 #include "web/WebRemoteFrameImpl.h" |
| 234 #include "web/WebViewImpl.h" | 234 #include "web/WebViewImpl.h" |
| 235 | 235 |
| (...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1302 input_method_controller.CancelComposition(); | 1302 input_method_controller.CancelComposition(); |
| 1303 | 1303 |
| 1304 if (composition_start == composition_end) | 1304 if (composition_start == composition_end) |
| 1305 return true; | 1305 return true; |
| 1306 | 1306 |
| 1307 // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets | 1307 // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 1308 // needs to be audited. See http://crbug.com/590369 for more details. | 1308 // needs to be audited. See http://crbug.com/590369 for more details. |
| 1309 GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets(); | 1309 GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets(); |
| 1310 | 1310 |
| 1311 input_method_controller.SetCompositionFromExistingText( | 1311 input_method_controller.SetCompositionFromExistingText( |
| 1312 CompositionUnderlineVectorBuilder(underlines), composition_start, | 1312 CompositionUnderlineVectorBuilder::Build(underlines), composition_start, |
| 1313 composition_end); | 1313 composition_end); |
| 1314 | 1314 |
| 1315 return true; | 1315 return true; |
| 1316 } | 1316 } |
| 1317 | 1317 |
| 1318 void WebLocalFrameImpl::ExtendSelectionAndDelete(int before, int after) { | 1318 void WebLocalFrameImpl::ExtendSelectionAndDelete(int before, int after) { |
| 1319 TRACE_EVENT0("blink", "WebLocalFrameImpl::extendSelectionAndDelete"); | 1319 TRACE_EVENT0("blink", "WebLocalFrameImpl::extendSelectionAndDelete"); |
| 1320 if (WebPlugin* plugin = FocusedPluginIfInputMethodSupported()) { | 1320 if (WebPlugin* plugin = FocusedPluginIfInputMethodSupported()) { |
| 1321 plugin->ExtendSelectionAndDelete(before, after); | 1321 plugin->ExtendSelectionAndDelete(before, after); |
| 1322 return; | 1322 return; |
| (...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2575 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const { | 2575 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const { |
| 2576 return *text_checker_client_; | 2576 return *text_checker_client_; |
| 2577 } | 2577 } |
| 2578 | 2578 |
| 2579 void WebLocalFrameImpl::SetTextCheckClient( | 2579 void WebLocalFrameImpl::SetTextCheckClient( |
| 2580 WebTextCheckClient* text_check_client) { | 2580 WebTextCheckClient* text_check_client) { |
| 2581 text_check_client_ = text_check_client; | 2581 text_check_client_ = text_check_client; |
| 2582 } | 2582 } |
| 2583 | 2583 |
| 2584 } // namespace blink | 2584 } // namespace blink |
| OLD | NEW |