Changeset 63602 in webkit
- Timestamp:
- Jul 16, 2010 6:05:50 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r63599 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 This patch just reverts the change to WebCore/page/FocusController.cpp 9 made in changeset 61484, and add a new method named 10 willSetInputMethodState in EditorClient interface, which gets called 11 in FocusController just before changing the focused node. 12 13 No new tests, because no new functionality. 14 15 * loader/EmptyClients.h: 16 (WebCore::EmptyEditorClient::willSetInputMethodState): 17 * page/EditorClient.h: 18 * page/FocusController.cpp: 19 (WebCore::FocusController::setFocusedNode): 20 1 21 2010-07-16 Matthew Delaney <mdelaney@apple.com> 2 22 -
trunk/WebCore/loader/EmptyClients.h
r63339 r63602 435 435 virtual bool spellingUIIsShowing() { return false; } 436 436 virtual void getGuessesForWord(const String&, Vector<String>&) { } 437 virtual void willSetInputMethodState() { } 437 438 virtual void setInputMethodState(bool) { } 438 439 … … 496 497 497 498 #endif // EmptyClients_h 498 -
trunk/WebCore/page/EditorClient.h
r61436 r63602 184 184 virtual bool spellingUIIsShowing() = 0; 185 185 virtual void getGuessesForWord(const String&, Vector<String>& guesses) = 0; 186 virtual void willSetInputMethodState() = 0; 186 187 virtual void setInputMethodState(bool enabled) = 0; 187 188 }; … … 190 191 191 192 #endif // EditorClient_h 192 -
trunk/WebCore/page/FocusController.cpp
r62179 r63602 596 596 return false; 597 597 598 // Set input method state before changing the focused node, so that the 599 // input method can still have a chance to finish the ongoing composition 600 // session. 601 m_page->editorClient()->setInputMethodState(node ? node->shouldUseInputMethod() : false); 598 m_page->editorClient()->willSetInputMethodState(); 602 599 603 600 clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), node); … … 606 603 if (oldDocument) 607 604 oldDocument->setFocusedNode(0); 605 m_page->editorClient()->setInputMethodState(false); 608 606 return true; 609 607 } … … 612 610 613 611 if (newDocument && newDocument->focusedNode() == node) { 612 m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod()); 614 613 return true; 615 614 } … … 623 622 newDocument->setFocusedNode(node); 624 623 624 m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod()); 625 625 626 return true; 626 627 } -
trunk/WebKit/ChangeLog
r63417 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * efl/WebCoreSupport/EditorClientEfl.cpp: 11 (WebCore::EditorClientEfl::willSetInputMethodState): 12 * efl/WebCoreSupport/EditorClientEfl.h: 13 1 14 2010-07-15 Mark Rowe <mrowe@apple.com> 2 15 -
trunk/WebKit/chromium/ChangeLog
r63589 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Implement EditorClient::willSetInputMethodState which replaces 9 setInputMethodState method. 10 11 * src/EditorClientImpl.cpp: 12 (WebKit::EditorClientImpl::willSetInputMethodState): 13 (WebKit::EditorClientImpl::setInputMethodState): 14 * src/EditorClientImpl.h: 15 1 16 2010-07-16 Kent Tamura <tkent@chromium.org> 2 17 -
trunk/WebKit/chromium/src/EditorClientImpl.cpp
r62893 r63602 936 936 } 937 937 938 void EditorClientImpl:: setInputMethodState(bool enabled)938 void EditorClientImpl::willSetInputMethodState() 939 939 { 940 940 if (m_webView->client()) … … 942 942 } 943 943 944 void EditorClientImpl::setInputMethodState(bool) 945 { 946 } 947 944 948 } // namesace WebKit -
trunk/WebKit/chromium/src/EditorClientImpl.h
r55031 r63602 109 109 virtual void getGuessesForWord(const WebCore::String& word, 110 110 WTF::Vector<WebCore::String>& guesses); 111 virtual void willSetInputMethodState(); 111 112 virtual void setInputMethodState(bool enabled); 112 113 -
trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
r60463 r63602 40 40 41 41 namespace WebCore { 42 43 void EditorClientEfl::willSetInputMethodState() 44 { 45 notImplemented(); 46 } 42 47 43 48 void EditorClientEfl::setInputMethodState(bool active) -
trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.h
r61331 r63602 112 112 virtual bool spellingUIIsShowing(); 113 113 virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses); 114 virtual void willSetInputMethodState(); 114 115 virtual void setInputMethodState(bool enabled); 115 116 -
trunk/WebKit/gtk/ChangeLog
r63528 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebCoreSupport/EditorClientGtk.cpp: 11 (WebKit::EditorClient::willSetInputMethodState): 12 * WebCoreSupport/EditorClientGtk.h: 13 1 14 2010-07-16 Nate Chapin <japhet@chromium.org> 2 15 -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r61808 r63602 216 216 } 217 217 218 void EditorClient::willSetInputMethodState() 219 { 220 } 221 218 222 void EditorClient::setInputMethodState(bool active) 219 223 { -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
r59158 r63602 131 131 virtual bool spellingUIIsShowing(); 132 132 virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses); 133 virtual void willSetInputMethodState(); 133 134 virtual void setInputMethodState(bool enabled); 134 135 -
trunk/WebKit/haiku/ChangeLog
r63339 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebCoreSupport/EditorClientHaiku.cpp: 11 (WebCore::EditorClientHaiku::willSetInputMethodState): 12 * WebCoreSupport/EditorClientHaiku.h: 13 1 14 2010-07-14 Sam Weinig <sam@webkit.org> 2 15 -
trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
r60463 r63602 467 467 } 468 468 469 void EditorClientHaiku::willSetInputMethodState() 470 { 471 notImplemented(); 472 } 473 469 474 void EditorClientHaiku::setInputMethodState(bool enabled) 470 475 { … … 478 483 479 484 } // namespace WebCore 480 -
trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h
r46015 r63602 109 109 virtual bool spellingUIIsShowing(); 110 110 virtual void getGuessesForWord(const String&, Vector<String>& guesses); 111 virtual void willSetInputMethodState(); 111 112 virtual void setInputMethodState(bool enabled); 112 113 … … 122 123 123 124 #endif // EditorClientHaiku_h 124 -
trunk/WebKit/mac/ChangeLog
r63595 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebCoreSupport/WebEditorClient.h: 11 * WebCoreSupport/WebEditorClient.mm: 12 (WebEditorClient::willSetInputMethodState): 13 1 14 2010-07-16 Dan Bernstein <mitz@apple.com> 2 15 -
trunk/WebKit/mac/WebCoreSupport/WebEditorClient.h
r43980 r63602 128 128 virtual bool spellingUIIsShowing(); 129 129 virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses); 130 virtual void willSetInputMethodState(); 130 131 virtual void setInputMethodState(bool enabled); 131 132 private: -
trunk/WebKit/mac/WebCoreSupport/WebEditorClient.mm
r58266 r63602 819 819 } 820 820 821 void WebEditorClient::willSetInputMethodState() 822 { 823 } 824 821 825 void WebEditorClient::setInputMethodState(bool) 822 826 { -
trunk/WebKit/qt/ChangeLog
r63339 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebCoreSupport/EditorClientQt.cpp: 11 (WebCore::EditorClientQt::willSetInputMethodState): 12 * WebCoreSupport/EditorClientQt.h: 13 1 14 2010-07-14 Sam Weinig <sam@webkit.org> 2 15 -
trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
r61395 r63602 588 588 } 589 589 590 void EditorClientQt::willSetInputMethodState() 591 { 592 } 593 590 594 void EditorClientQt::setInputMethodState(bool active) 591 595 { -
trunk/WebKit/qt/WebCoreSupport/EditorClientQt.h
r60923 r63602 106 106 virtual bool spellingUIIsShowing(); 107 107 virtual void getGuessesForWord(const String&, Vector<String>& guesses); 108 virtual void willSetInputMethodState(); 108 109 virtual void setInputMethodState(bool enabled); 109 110 -
trunk/WebKit/win/ChangeLog
r63537 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebCoreSupport/WebEditorClient.cpp: 11 (WebEditorClient::willSetInputMethodState): 12 * WebCoreSupport/WebEditorClient.h: 13 1 14 2010-07-16 Mikhail Naganov <mnaganov@chromium.org> 2 15 -
trunk/WebKit/win/WebCoreSupport/WebEditorClient.cpp
r48478 r63602 777 777 } 778 778 779 void WebEditorClient::willSetInputMethodState() 780 { 781 } 782 779 783 void WebEditorClient::setInputMethodState(bool enabled) 780 784 { -
trunk/WebKit/win/WebCoreSupport/WebEditorClient.h
r43980 r63602 110 110 virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses); 111 111 112 virtual void willSetInputMethodState(); 112 113 virtual void setInputMethodState(bool); 113 114 -
trunk/WebKit/wx/ChangeLog
r63339 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebKitSupport/EditorClientWx.cpp: 11 (WebCore::EditorClientWx::willSetInputMethodState): 12 * WebKitSupport/EditorClientWx.h: 13 1 14 2010-07-14 Sam Weinig <sam@webkit.org> 2 15 -
trunk/WebKit/wx/WebKitSupport/EditorClientWx.cpp
r56705 r63602 539 539 } 540 540 541 void EditorClientWx::willSetInputMethodState() 542 { 543 notImplemented(); 544 } 545 541 546 void EditorClientWx::setInputMethodState(bool enabled) 542 547 { -
trunk/WebKit/wx/WebKitSupport/EditorClientWx.h
r43987 r63602 111 111 virtual String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&); 112 112 113 virtual void willSetInputMethodState(); 113 114 virtual void setInputMethodState(bool enabled); 114 115 -
trunk/WebKit2/ChangeLog
r63600 r63602 1 2010-07-16 Zhe Su <suzhe@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms 6 https://bugs.webkit.org/show_bug.cgi?id=42253 7 8 Dummy implementation of EditorClient::willSetInputMethodState. 9 10 * WebProcess/WebCoreSupport/WebEditorClient.cpp: 11 (WebKit::WebEditorClient::willSetInputMethodState): 12 * WebProcess/WebCoreSupport/WebEditorClient.h: 13 1 14 2010-07-16 Alice Liu <alice.liu@apple.com> 2 15 -
trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
r62866 r63602 416 416 } 417 417 418 void WebEditorClient::willSetInputMethodState() 419 { 420 notImplemented(); 421 } 422 418 423 void WebEditorClient::setInputMethodState(bool) 419 424 { … … 422 427 423 428 } // namespace WebKit 424 -
trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
r57309 r63602 130 130 virtual bool spellingUIIsShowing(); 131 131 virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses); 132 virtual void willSetInputMethodState(); 132 133 virtual void setInputMethodState(bool enabled); 133 134
Note: See TracChangeset
for help on using the changeset viewer.