Changeset 67458 in webkit
- Timestamp:
- Sep 14, 2010 4:07:30 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r67455 r67458 1 2010-09-14 Eric Seidel <eric@webkit.org> 2 3 Unreviewed, reverting changes r67451 and r67451. 4 Broke lots of builders. 5 6 Only intercept ESC key press when autocorrection UI is visible. 7 https://bugs.webkit.org/show_bug.cgi?id=45071 8 9 * editing/Editor.cpp: 10 * editing/Editor.h: 11 * editing/EditorCommand.cpp: 12 (WebCore::createCommandMap): 13 * loader/EmptyClients.h: 14 * page/EditorClient.h: 15 1 16 2010-09-14 Kinuko Yasuda <kinuko@chromium.org> 2 17 -
trunk/WebCore/editing/Editor.cpp
r67451 r67458 2855 2855 } 2856 2856 2857 bool Editor::isShowingCorrectionPanel()2858 {2859 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)2860 if (client())2861 return client()->isShowingCorrectionPanel();2862 #endif2863 return false;2864 }2865 2866 2857 PassRefPtr<Range> Editor::rangeForPoint(const IntPoint& windowPoint) 2867 2858 { -
trunk/WebCore/editing/Editor.h
r67451 r67458 314 314 void startCorrectionPanelTimer(); 315 315 void handleRejectedCorrection(); 316 bool isShowingCorrectionPanel();317 316 318 317 void pasteAsFragment(PassRefPtr<DocumentFragment>, bool smartReplace, bool matchStyle); -
trunk/WebCore/editing/EditorCommand.cpp
r67452 r67458 1122 1122 return false; 1123 1123 } 1124 1125 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)1126 static bool supportedDismissCorrectionPanel(Frame* frame, EditorCommandSource source)1127 {1128 return supportedFromMenuOrKeyBinding(frame, source) && frame->editor()->isShowingCorrectionPanel();1129 }1130 #endif1131 1124 1132 1125 // Enabled functions … … 1475 1468 { "YankAndSelect", { executeYankAndSelect, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, 1476 1469 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) 1477 { "CancelOperation", { executeCancelOperation, supported DismissCorrectionPanel, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },1470 { "CancelOperation", { executeCancelOperation, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, 1478 1471 #endif 1479 1472 }; -
trunk/WebCore/loader/EmptyClients.h
r67451 r67458 471 471 virtual void showCorrectionPanel(const FloatRect&, const String&, const String&, Editor*) { } 472 472 virtual void dismissCorrectionPanel(bool) { } 473 virtual bool isShowingCorrectionPanel() { return false; }474 473 #endif 475 474 virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&) { } -
trunk/WebCore/page/EditorClient.h
r67451 r67458 192 192 virtual void showCorrectionPanel(const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacmentString, Editor*) = 0; 193 193 virtual void dismissCorrectionPanel(bool correctionAccepted) = 0; 194 virtual bool isShowingCorrectionPanel() = 0;195 194 #endif 196 195 -
trunk/WebKit/mac/ChangeLog
r67451 r67458 1 2010-09-14 Eric Seidel <eric@webkit.org> 2 3 Unreviewed, reverting changes r67451 and r67451. 4 Broke lots of builders. 5 6 Only intercept ESC key press when autocorrection UI is visible. 7 https://bugs.webkit.org/show_bug.cgi?id=45071 8 9 * WebCoreSupport/WebEditorClient.h: 10 * WebCoreSupport/WebEditorClient.mm: 11 (WebEditorClient::WebEditorClient): 12 (WebEditorClient::dismissCorrectionPanel): 13 1 14 2010-09-14 Jia Pu <jpu@apple.com> 2 15 -
trunk/WebKit/mac/WebCoreSupport/WebEditorClient.h
r67451 r67458 136 136 virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*); 137 137 virtual void dismissCorrectionPanel(bool correctionAccepted); 138 virtual bool isShowingCorrectionPanel();139 138 #endif 140 139 private: -
trunk/WebKit/mac/WebCoreSupport/WebEditorClient.mm
r67451 r67458 88 88 } 89 89 90 static const int InvalidCorrectionPanelTag = 0;91 92 90 #ifdef BUILDING_ON_TIGER 93 91 @interface NSSpellChecker (NotYetPublicMethods) … … 187 185 , m_haveUndoRedoOperations(false) 188 186 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) 189 , m_correctionPanelTag( InvalidCorrectionPanelTag)187 , m_correctionPanelTag(-1) 190 188 #endif 191 189 { … … 887 885 void WebEditorClient::dismissCorrectionPanel(bool correctionAccepted) 888 886 { 889 if (m_correctionPanelTag != InvalidCorrectionPanelTag) {887 if (m_correctionPanelTag >= 0) { 890 888 [[NSSpellChecker sharedSpellChecker] dismissCorrection:m_correctionPanelTag acceptCorrection:correctionAccepted]; 891 m_correctionPanelTag = InvalidCorrectionPanelTag;889 m_correctionPanelTag = -1; 892 890 } 893 }894 895 bool WebEditorClient::isShowingCorrectionPanel()896 {897 return m_correctionPanelTag != InvalidCorrectionPanelTag;898 891 } 899 892 #endif -
trunk/WebKit2/ChangeLog
r67451 r67458 1 2010-09-14 Eric Seidel <eric@webkit.org> 2 3 Unreviewed, reverting changes r67451 and r67451. 4 Broke lots of builders. 5 6 Only intercept ESC key press when autocorrection UI is visible. 7 https://bugs.webkit.org/show_bug.cgi?id=45071 8 9 * WebProcess/WebCoreSupport/WebEditorClient.cpp: 10 (WebKit::WebEditorClient::dismissCorrectionPanel): 11 * WebProcess/WebCoreSupport/WebEditorClient.h: 12 1 13 2010-09-14 Jia Pu <jpu@apple.com> 2 14 -
trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
r67451 r67458 504 504 notImplemented(); 505 505 } 506 507 bool WebEditorClient::isShowingCorrectionPanel()508 {509 notImplemented();510 return false;511 }512 506 #endif 513 507 -
trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
r67451 r67458 137 137 virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*); 138 138 virtual void dismissCorrectionPanel(bool correctionAccepted); 139 virtual bool isShowingCorrectionPanel();140 139 #endif 141 140 WebPage* m_page;
Note: See TracChangeset
for help on using the changeset viewer.