diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /WebKit/chromium/src/WebFrameImpl.cpp | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'WebKit/chromium/src/WebFrameImpl.cpp')
| -rw-r--r-- | WebKit/chromium/src/WebFrameImpl.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp index 4422e1b..5baf73b 100644 --- a/WebKit/chromium/src/WebFrameImpl.cpp +++ b/WebKit/chromium/src/WebFrameImpl.cpp @@ -82,6 +82,7 @@ #include "DocumentFragment.h" // Only needed for ReplaceSelectionCommand.h :( #include "DocumentLoader.h" #include "DocumentMarker.h" +#include "DocumentMarkerController.h" #include "Editor.h" #include "EventHandler.h" #include "FormState.h" @@ -712,7 +713,7 @@ WebPerformance WebFrameImpl::performance() const if (!m_frame || !m_frame->domWindow()) return WebPerformance(); - return WebPerformance(m_frame->domWindow()->webkitPerformance()); + return WebPerformance(m_frame->domWindow()->performance()); } WebSecurityOrigin WebFrameImpl::securityOrigin() const @@ -1073,7 +1074,12 @@ void WebFrameImpl::replaceSelection(const WebString& text) void WebFrameImpl::insertText(const WebString& text) { - frame()->editor()->insertText(text, 0); + Editor* editor = frame()->editor(); + + if (editor->hasComposition()) + editor->confirmComposition(text); + else + editor->insertText(text, 0); } void WebFrameImpl::setMarkedText( @@ -1081,8 +1087,6 @@ void WebFrameImpl::setMarkedText( { Editor* editor = frame()->editor(); - editor->confirmComposition(text); - Vector<CompositionUnderline> decorations; editor->setComposition(text, decorations, location, length); } @@ -1150,11 +1154,11 @@ bool WebFrameImpl::executeCommand(const WebString& name) // support. if (command == "DeleteToEndOfParagraph") { Editor* editor = frame()->editor(); - if (!editor->deleteWithDirection(SelectionController::DirectionForward, + if (!editor->deleteWithDirection(DirectionForward, ParagraphBoundary, true, false)) { - editor->deleteWithDirection(SelectionController::DirectionForward, + editor->deleteWithDirection(DirectionForward, CharacterGranularity, true, false); |