Changeset 63602 in webkit


Ignore:
Timestamp:
Jul 16, 2010 6:05:50 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

This patch just reverts the change to WebCore/page/FocusController.cpp
made in changeset 61484, and add a new method named
willSetInputMethodState in EditorClient interface, which gets called
in FocusController just before changing the focused node.

No new tests, because no new functionality.

  • loader/EmptyClients.h: (WebCore::EmptyEditorClient::willSetInputMethodState):
  • page/EditorClient.h:
  • page/FocusController.cpp: (WebCore::FocusController::setFocusedNode):

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • efl/WebCoreSupport/EditorClientEfl.cpp: (WebCore::EditorClientEfl::willSetInputMethodState):
  • efl/WebCoreSupport/EditorClientEfl.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Implement EditorClient::willSetInputMethodState which replaces
setInputMethodState method.

  • src/EditorClientImpl.cpp: (WebKit::EditorClientImpl::willSetInputMethodState): (WebKit::EditorClientImpl::setInputMethodState):
  • src/EditorClientImpl.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebCoreSupport/EditorClientGtk.cpp: (WebKit::EditorClient::willSetInputMethodState):
  • WebCoreSupport/EditorClientGtk.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebCoreSupport/EditorClientHaiku.cpp: (WebCore::EditorClientHaiku::willSetInputMethodState):
  • WebCoreSupport/EditorClientHaiku.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebCoreSupport/WebEditorClient.h:
  • WebCoreSupport/WebEditorClient.mm: (WebEditorClient::willSetInputMethodState):

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::willSetInputMethodState):
  • WebCoreSupport/EditorClientQt.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebCoreSupport/WebEditorClient.cpp: (WebEditorClient::willSetInputMethodState):
  • WebCoreSupport/WebEditorClient.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebKitSupport/EditorClientWx.cpp: (WebCore::EditorClientWx::willSetInputMethodState):
  • WebKitSupport/EditorClientWx.h:

2010-07-16 Zhe Su <suzhe@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r61484): Broke focus behaviour on Qt and probably other platforms
https://bugs.webkit.org/show_bug.cgi?id=42253

Dummy implementation of EditorClient::willSetInputMethodState.

  • WebProcess/WebCoreSupport/WebEditorClient.cpp: (WebKit::WebEditorClient::willSetInputMethodState):
  • WebProcess/WebCoreSupport/WebEditorClient.h:
Location:
trunk
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r63599 r63602  
     12010-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
    1212010-07-16  Matthew Delaney  <mdelaney@apple.com>
    222
  • trunk/WebCore/loader/EmptyClients.h

    r63339 r63602  
    435435    virtual bool spellingUIIsShowing() { return false; }
    436436    virtual void getGuessesForWord(const String&, Vector<String>&) { }
     437    virtual void willSetInputMethodState() { }
    437438    virtual void setInputMethodState(bool) { }
    438439
     
    496497
    497498#endif // EmptyClients_h
    498 
  • trunk/WebCore/page/EditorClient.h

    r61436 r63602  
    184184    virtual bool spellingUIIsShowing() = 0;
    185185    virtual void getGuessesForWord(const String&, Vector<String>& guesses) = 0;
     186    virtual void willSetInputMethodState() = 0;
    186187    virtual void setInputMethodState(bool enabled) = 0;
    187188};
     
    190191
    191192#endif // EditorClient_h
    192 
  • trunk/WebCore/page/FocusController.cpp

    r62179 r63602  
    596596        return false;
    597597
    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();
    602599
    603600    clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), node);
     
    606603        if (oldDocument)
    607604            oldDocument->setFocusedNode(0);
     605        m_page->editorClient()->setInputMethodState(false);
    608606        return true;
    609607    }
     
    612610
    613611    if (newDocument && newDocument->focusedNode() == node) {
     612        m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
    614613        return true;
    615614    }
     
    623622        newDocument->setFocusedNode(node);
    624623   
     624    m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
     625
    625626    return true;
    626627}
  • trunk/WebKit/ChangeLog

    r63417 r63602  
     12010-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
    1142010-07-15  Mark Rowe  <mrowe@apple.com>
    215
  • trunk/WebKit/chromium/ChangeLog

    r63589 r63602  
     12010-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
    1162010-07-16  Kent Tamura  <tkent@chromium.org>
    217
  • trunk/WebKit/chromium/src/EditorClientImpl.cpp

    r62893 r63602  
    936936}
    937937
    938 void EditorClientImpl::setInputMethodState(bool enabled)
     938void EditorClientImpl::willSetInputMethodState()
    939939{
    940940    if (m_webView->client())
     
    942942}
    943943
     944void EditorClientImpl::setInputMethodState(bool)
     945{
     946}
     947
    944948} // namesace WebKit
  • trunk/WebKit/chromium/src/EditorClientImpl.h

    r55031 r63602  
    109109    virtual void getGuessesForWord(const WebCore::String& word,
    110110                                   WTF::Vector<WebCore::String>& guesses);
     111    virtual void willSetInputMethodState();
    111112    virtual void setInputMethodState(bool enabled);
    112113
  • trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

    r60463 r63602  
    4040
    4141namespace WebCore {
     42
     43void EditorClientEfl::willSetInputMethodState()
     44{
     45    notImplemented();
     46}
    4247
    4348void EditorClientEfl::setInputMethodState(bool active)
  • trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.h

    r61331 r63602  
    112112    virtual bool spellingUIIsShowing();
    113113    virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses);
     114    virtual void willSetInputMethodState();
    114115    virtual void setInputMethodState(bool enabled);
    115116
  • trunk/WebKit/gtk/ChangeLog

    r63528 r63602  
     12010-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
    1142010-07-16  Nate Chapin  <japhet@chromium.org>
    215
  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

    r61808 r63602  
    216216}
    217217
     218void EditorClient::willSetInputMethodState()
     219{
     220}
     221
    218222void EditorClient::setInputMethodState(bool active)
    219223{
  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

    r59158 r63602  
    131131        virtual bool spellingUIIsShowing();
    132132        virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
     133        virtual void willSetInputMethodState();
    133134        virtual void setInputMethodState(bool enabled);
    134135
  • trunk/WebKit/haiku/ChangeLog

    r63339 r63602  
     12010-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
    1142010-07-14  Sam Weinig  <sam@webkit.org>
    215
  • trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp

    r60463 r63602  
    467467}
    468468
     469void EditorClientHaiku::willSetInputMethodState()
     470{
     471    notImplemented();
     472}
     473
    469474void EditorClientHaiku::setInputMethodState(bool enabled)
    470475{
     
    478483
    479484} // namespace WebCore
    480 
  • trunk/WebKit/haiku/WebCoreSupport/EditorClientHaiku.h

    r46015 r63602  
    109109        virtual bool spellingUIIsShowing();
    110110        virtual void getGuessesForWord(const String&, Vector<String>& guesses);
     111        virtual void willSetInputMethodState();
    111112        virtual void setInputMethodState(bool enabled);
    112113
     
    122123
    123124#endif // EditorClientHaiku_h
    124 
  • trunk/WebKit/mac/ChangeLog

    r63595 r63602  
     12010-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
    1142010-07-16  Dan Bernstein  <mitz@apple.com>
    215
  • trunk/WebKit/mac/WebCoreSupport/WebEditorClient.h

    r43980 r63602  
    128128    virtual bool spellingUIIsShowing();
    129129    virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
     130    virtual void willSetInputMethodState();
    130131    virtual void setInputMethodState(bool enabled);
    131132private:
  • trunk/WebKit/mac/WebCoreSupport/WebEditorClient.mm

    r58266 r63602  
    819819}
    820820
     821void WebEditorClient::willSetInputMethodState()
     822{
     823}
     824
    821825void WebEditorClient::setInputMethodState(bool)
    822826{
  • trunk/WebKit/qt/ChangeLog

    r63339 r63602  
     12010-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
    1142010-07-14  Sam Weinig  <sam@webkit.org>
    215
  • trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

    r61395 r63602  
    588588}
    589589
     590void EditorClientQt::willSetInputMethodState()
     591{
     592}
     593
    590594void EditorClientQt::setInputMethodState(bool active)
    591595{
  • trunk/WebKit/qt/WebCoreSupport/EditorClientQt.h

    r60923 r63602  
    106106    virtual bool spellingUIIsShowing();
    107107    virtual void getGuessesForWord(const String&, Vector<String>& guesses);
     108    virtual void willSetInputMethodState();
    108109    virtual void setInputMethodState(bool enabled);
    109110
  • trunk/WebKit/win/ChangeLog

    r63537 r63602  
     12010-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
    1142010-07-16  Mikhail Naganov  <mnaganov@chromium.org>
    215
  • trunk/WebKit/win/WebCoreSupport/WebEditorClient.cpp

    r48478 r63602  
    777777}
    778778
     779void WebEditorClient::willSetInputMethodState()
     780{
     781}
     782
    779783void WebEditorClient::setInputMethodState(bool enabled)
    780784{
  • trunk/WebKit/win/WebCoreSupport/WebEditorClient.h

    r43980 r63602  
    110110    virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses);
    111111
     112    virtual void willSetInputMethodState();
    112113    virtual void setInputMethodState(bool);
    113114
  • trunk/WebKit/wx/ChangeLog

    r63339 r63602  
     12010-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
    1142010-07-14  Sam Weinig  <sam@webkit.org>
    215
  • trunk/WebKit/wx/WebKitSupport/EditorClientWx.cpp

    r56705 r63602  
    539539}
    540540
     541void EditorClientWx::willSetInputMethodState()
     542{
     543    notImplemented();
     544}
     545
    541546void EditorClientWx::setInputMethodState(bool enabled)
    542547{
  • trunk/WebKit/wx/WebKitSupport/EditorClientWx.h

    r43987 r63602  
    111111    virtual String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&);
    112112   
     113    virtual void willSetInputMethodState();
    113114    virtual void setInputMethodState(bool enabled);
    114115
  • trunk/WebKit2/ChangeLog

    r63600 r63602  
     12010-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
    1142010-07-16  Alice Liu  <alice.liu@apple.com>
    215
  • trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

    r62866 r63602  
    416416}
    417417
     418void WebEditorClient::willSetInputMethodState()
     419{
     420    notImplemented();
     421}
     422
    418423void WebEditorClient::setInputMethodState(bool)
    419424{
     
    422427
    423428} // namespace WebKit
    424 
  • trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

    r57309 r63602  
    130130    virtual bool spellingUIIsShowing();
    131131    virtual void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses);
     132    virtual void willSetInputMethodState();
    132133    virtual void setInputMethodState(bool enabled);
    133134
Note: See TracChangeset for help on using the changeset viewer.