Skip to content
Permalink
Browse files
Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-01-31

Source/WebCore:

* editing/Editor.cpp:
* editing/Editor.h:
(Editor):

Source/WebKit/chromium:

* public/WebViewClient.h:
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::respondToChangedSelection):

Source/WebKit/efl:

* WebCoreSupport/EditorClientEfl.cpp:
(WebCore::EditorClientEfl::respondToChangedSelection):

Source/WebKit/gtk:

* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::EditorClient::respondToChangedSelection):

Source/WebKit/mac:

* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateSelectionForInputManager]):

Source/WebKit/win:

* WebView.cpp:
(WebView::updateSelectionForIME):

LayoutTests:

* platform/chromium/TestExpectations:

Canonical link: https://commits.webkit.org/126791@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@141525 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
WebKit Review Bot authored and webkit-commit-queue committed Feb 1, 2013
1 parent 41f510d commit 0daeaefe7787addeb78ba91ce21946d02c95a7b6
Showing 16 changed files with 105 additions and 22 deletions.
@@ -1,3 +1,13 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* platform/chromium/TestExpectations:

2013-01-31 Hayato Ito <hayato@chromium.org>

Use TouchEvent.targetTouches rather than TouchEvent.touches since the order of Touches in TouchList is not guaranteed.
@@ -1105,6 +1105,8 @@ crbug.com/64733 editing/text-iterator/findString.html [ Failure ]
# Selection is wrong.
crbug.com/64938 editing/selection/5354455-1.html [ Failure ]

webkit.org/b/55560 editing/input/setting-input-value-cancel-ime-composition.html [ Failure ]

# New test added in r82159
crbug.com/77706 editing/spelling/grammar.html [ Failure ]

@@ -1,3 +1,15 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* editing/Editor.cpp:
* editing/Editor.h:
(Editor):

2013-01-31 Changhun Kang <temoochin@company100.net>

Rename from parentOrHost* to parentOrShadowHost* in Node.h.
@@ -1343,17 +1343,6 @@ void Editor::cancelComposition()
setComposition(emptyString(), CancelComposition);
}

bool Editor::cancelCompositionIfSelectionIsInvalid()
{
unsigned start;
unsigned end;
if (!hasComposition() || ignoreCompositionSelectionChange() || getCompositionSelection(start, end))
return false;

cancelComposition();
return true;
}

void Editor::confirmComposition(const String& text)
{
setComposition(text, ConfirmComposition);
@@ -296,7 +296,6 @@ class Editor : public FrameDestructionObserver {
void confirmComposition();
void confirmComposition(const String&); // if no existing composition, replaces selection
void cancelComposition();
bool cancelCompositionIfSelectionIsInvalid();
PassRefPtr<Range> compositionRange() const;
bool getCompositionSelection(unsigned& selectionStart, unsigned& selectionEnd) const;
bool setSelectionOffsets(int selectionStart, int selectionEnd);
@@ -1,3 +1,15 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* public/WebViewClient.h:
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::respondToChangedSelection):

2013-01-31 Alec Flett <alecflett@chromium.org>

IndexedDB: remove old transaction backend bootstrap code
@@ -190,7 +190,6 @@ class WebViewClient : virtual public WebWidgetClient {
virtual bool isSelectTrailingWhitespaceEnabled() { return true; }

virtual void didBeginEditing() { }
virtual void didCancelCompositionOnSelectionChange() { }
virtual void didChangeSelection(bool isSelectionEmpty) { }
virtual void didChangeContents() { }
virtual void didExecuteCommand(const WebString& commandName) { }
@@ -268,11 +268,8 @@ void EditorClientImpl::didBeginEditing()
void EditorClientImpl::respondToChangedSelection(Frame* frame)
{
if (m_webView->client()) {
if (frame) {
if (frame)
m_webView->client()->didChangeSelection(!frame->selection()->isRange());
if (frame->editor()->cancelCompositionIfSelectionIsInvalid())
m_webView->client()->didCancelCompositionOnSelectionChange();
}
}
}

@@ -1,3 +1,14 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* WebCoreSupport/EditorClientEfl.cpp:
(WebCore::EditorClientEfl::respondToChangedSelection):

2013-01-31 Aurimas Liutikas <aurimas@chromium.org>

Editor::m_compositionNode not updated on HTMLInputElement::setValue()
@@ -152,7 +152,14 @@ void EditorClientEfl::respondToChangedSelection(Frame* coreFrame)
Evas_Object* webFrame = EWKPrivate::kitFrame(coreFrame);
ewk_frame_editor_client_selection_changed(webFrame);

coreFrame->editor()->cancelCompositionIfSelectionIsInvalid();
if (!coreFrame->editor()->hasComposition() || coreFrame->editor()->ignoreCompositionSelectionChange())
return;

unsigned start;
unsigned end;

if (!coreFrame->editor()->getCompositionSelection(start, end))
coreFrame->editor()->cancelComposition();
}

void EditorClientEfl::didEndEditing()
@@ -1,3 +1,14 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::EditorClient::respondToChangedSelection):

2013-01-31 Aurimas Liutikas <aurimas@chromium.org>

Editor::m_compositionNode not updated on HTMLInputElement::setValue()
@@ -262,7 +262,12 @@ void EditorClient::respondToChangedSelection(Frame* frame)
setSelectionPrimaryClipboardIfNeeded(m_webView);
#endif

if (frame->editor()->cancelCompositionIfSelectionIsInvalid())
if (!frame->editor()->hasComposition() || frame->editor()->ignoreCompositionSelectionChange())
return;

unsigned start;
unsigned end;
if (!frame->editor()->getCompositionSelection(start, end))
m_webView->priv->imFilter.resetContext();
}

@@ -1,3 +1,14 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateSelectionForInputManager]):

2013-01-31 Enrica Casucci <enrica@apple.com>

Mac: Editor::baseWritingDirectionForSelectionStart should return WritingDirection instead of NSWritingDirection.
@@ -6037,7 +6037,10 @@ - (void)_updateSelectionForInputManager

[self _updateSecureInputState];

if (!coreFrame->editor()->hasComposition() || coreFrame->editor()->ignoreCompositionSelectionChange())
if (!coreFrame->editor()->hasComposition())
return;

if (coreFrame->editor()->ignoreCompositionSelectionChange())
return;

unsigned start;
@@ -1,3 +1,14 @@
2013-01-31 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r141479.
http://trac.webkit.org/changeset/141479
https://bugs.webkit.org/show_bug.cgi?id=108564

breaks chromium test (Requested by morrita on #webkit).

* WebView.cpp:
(WebView::updateSelectionForIME):

2013-01-31 Aurimas Liutikas <aurimas@chromium.org>

Editor::m_compositionNode not updated on HTMLInputElement::setValue()
@@ -5481,11 +5481,15 @@ void WebView::resetIME(Frame* targetFrame)
void WebView::updateSelectionForIME()
{
Frame* targetFrame = m_page->focusController()->focusedOrMainFrame();
if (!targetFrame || !targetFrame->editor()->hasComposition())
return;

if (!targetFrame)
if (targetFrame->editor()->ignoreCompositionSelectionChange())
return;

if (!targetFrame->editor()->cancelCompositionIfSelectionIsInvalid())
unsigned start;
unsigned end;
if (!targetFrame->editor()->getCompositionSelection(start, end))
resetIME(targetFrame);
}

0 comments on commit 0daeaef

Please sign in to comment.