[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric at webkit.org
eric at webkit.org
Wed Dec 22 13:24:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2d518e06fddb2d7aa26013385e0d7f2a7b3e4250
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 11:07:30 2010 +0000
2010-09-14 Eric Seidel <eric at webkit.org>
Unreviewed, reverting changes r67451 and r67451.
Broke lots of builders.
Only intercept ESC key press when autocorrection UI is visible.
https://bugs.webkit.org/show_bug.cgi?id=45071
* editing/Editor.cpp:
* editing/Editor.h:
* editing/EditorCommand.cpp:
(WebCore::createCommandMap):
* loader/EmptyClients.h:
* page/EditorClient.h:
2010-09-14 Eric Seidel <eric at webkit.org>
Unreviewed, reverting changes r67451 and r67451.
Broke lots of builders.
Only intercept ESC key press when autocorrection UI is visible.
https://bugs.webkit.org/show_bug.cgi?id=45071
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::WebEditorClient):
(WebEditorClient::dismissCorrectionPanel):
2010-09-14 Eric Seidel <eric at webkit.org>
Unreviewed, reverting changes r67451 and r67451.
Broke lots of builders.
Only intercept ESC key press when autocorrection UI is visible.
https://bugs.webkit.org/show_bug.cgi?id=45071
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::dismissCorrectionPanel):
* WebProcess/WebCoreSupport/WebEditorClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ced3fde..4b22333 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-14 Eric Seidel <eric at webkit.org>
+
+ Unreviewed, reverting changes r67451 and r67451.
+ Broke lots of builders.
+
+ Only intercept ESC key press when autocorrection UI is visible.
+ https://bugs.webkit.org/show_bug.cgi?id=45071
+
+ * editing/Editor.cpp:
+ * editing/Editor.h:
+ * editing/EditorCommand.cpp:
+ (WebCore::createCommandMap):
+ * loader/EmptyClients.h:
+ * page/EditorClient.h:
+
2010-09-14 Kinuko Yasuda <kinuko at chromium.org>
Unreviewed; an attempt to fix Chromium Windows build.
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 125ecfa..3f9a5a5 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -2854,15 +2854,6 @@ void Editor::handleCancelOperation()
#endif
}
-bool Editor::isShowingCorrectionPanel()
-{
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- if (client())
- return client()->isShowingCorrectionPanel();
-#endif
- return false;
-}
-
PassRefPtr<Range> Editor::rangeForPoint(const IntPoint& windowPoint)
{
Document* document = m_frame->documentAtPoint(windowPoint);
diff --git a/WebCore/editing/Editor.h b/WebCore/editing/Editor.h
index 7a4a185..678ec59 100644
--- a/WebCore/editing/Editor.h
+++ b/WebCore/editing/Editor.h
@@ -313,7 +313,6 @@ public:
void handleCancelOperation();
void startCorrectionPanelTimer();
void handleRejectedCorrection();
- bool isShowingCorrectionPanel();
void pasteAsFragment(PassRefPtr<DocumentFragment>, bool smartReplace, bool matchStyle);
void pasteAsPlainText(const String&, bool smartReplace);
diff --git a/WebCore/editing/EditorCommand.cpp b/WebCore/editing/EditorCommand.cpp
index 1b1f14f..24ceb39 100644
--- a/WebCore/editing/EditorCommand.cpp
+++ b/WebCore/editing/EditorCommand.cpp
@@ -1122,13 +1122,6 @@ static bool supportedPaste(Frame* frame, EditorCommandSource source)
return false;
}
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-static bool supportedDismissCorrectionPanel(Frame* frame, EditorCommandSource source)
-{
- return supportedFromMenuOrKeyBinding(frame, source) && frame->editor()->isShowingCorrectionPanel();
-}
-#endif
-
// Enabled functions
static bool enabled(Frame*, Event*, EditorCommandSource)
@@ -1474,7 +1467,7 @@ static const CommandMap& createCommandMap()
{ "Yank", { executeYank, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "YankAndSelect", { executeYankAndSelect, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- { "CancelOperation", { executeCancelOperation, supportedDismissCorrectionPanel, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
+ { "CancelOperation", { executeCancelOperation, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
#endif
};
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index b3a196d..30b7857 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -470,7 +470,6 @@ public:
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
virtual void showCorrectionPanel(const FloatRect&, const String&, const String&, Editor*) { }
virtual void dismissCorrectionPanel(bool) { }
- virtual bool isShowingCorrectionPanel() { return false; }
#endif
virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&) { }
virtual void updateSpellingUIWithMisspelledWord(const String&) { }
diff --git a/WebCore/page/EditorClient.h b/WebCore/page/EditorClient.h
index c9d5f6a..d50a1f5 100644
--- a/WebCore/page/EditorClient.h
+++ b/WebCore/page/EditorClient.h
@@ -191,7 +191,6 @@ public:
#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
virtual void showCorrectionPanel(const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacmentString, Editor*) = 0;
virtual void dismissCorrectionPanel(bool correctionAccepted) = 0;
- virtual bool isShowingCorrectionPanel() = 0;
#endif
virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail& detail) = 0;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b5c1cd2..a9e0304 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14 Eric Seidel <eric at webkit.org>
+
+ Unreviewed, reverting changes r67451 and r67451.
+ Broke lots of builders.
+
+ Only intercept ESC key press when autocorrection UI is visible.
+ https://bugs.webkit.org/show_bug.cgi?id=45071
+
+ * WebCoreSupport/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::WebEditorClient):
+ (WebEditorClient::dismissCorrectionPanel):
+
2010-09-14 Jia Pu <jpu at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.h b/WebKit/mac/WebCoreSupport/WebEditorClient.h
index 0afe384..bddf87d 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.h
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.h
@@ -135,7 +135,6 @@ public:
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*);
virtual void dismissCorrectionPanel(bool correctionAccepted);
- virtual bool isShowingCorrectionPanel();
#endif
private:
void registerCommandForUndoOrRedo(PassRefPtr<WebCore::EditCommand>, bool isRedo);
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.mm b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
index 0b49563..dfeea70 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
@@ -87,8 +87,6 @@ static WebViewInsertAction kit(EditorInsertAction coreAction)
return static_cast<WebViewInsertAction>(coreAction);
}
-static const int InvalidCorrectionPanelTag = 0;
-
#ifdef BUILDING_ON_TIGER
@interface NSSpellChecker (NotYetPublicMethods)
- (void)learnWord:(NSString *)word;
@@ -186,7 +184,7 @@ WebEditorClient::WebEditorClient(WebView *webView)
, m_undoTarget([[[WebEditorUndoTarget alloc] init] autorelease])
, m_haveUndoRedoOperations(false)
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
- , m_correctionPanelTag(InvalidCorrectionPanelTag)
+ , m_correctionPanelTag(-1)
#endif
{
}
@@ -886,16 +884,11 @@ void WebEditorClient::showCorrectionPanel(const FloatRect& boundingBoxOfReplaced
void WebEditorClient::dismissCorrectionPanel(bool correctionAccepted)
{
- if (m_correctionPanelTag != InvalidCorrectionPanelTag) {
+ if (m_correctionPanelTag >= 0) {
[[NSSpellChecker sharedSpellChecker] dismissCorrection:m_correctionPanelTag acceptCorrection:correctionAccepted];
- m_correctionPanelTag = InvalidCorrectionPanelTag;
+ m_correctionPanelTag = -1;
}
}
-
-bool WebEditorClient::isShowingCorrectionPanel()
-{
- return m_correctionPanelTag != InvalidCorrectionPanelTag;
-}
#endif
void WebEditorClient::updateSpellingUIWithMisspelledWord(const String& misspelledWord)
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 64ae677..4b66f70 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14 Eric Seidel <eric at webkit.org>
+
+ Unreviewed, reverting changes r67451 and r67451.
+ Broke lots of builders.
+
+ Only intercept ESC key press when autocorrection UI is visible.
+ https://bugs.webkit.org/show_bug.cgi?id=45071
+
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::dismissCorrectionPanel):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+
2010-09-14 Jia Pu <jpu at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index 8f060eb..8d599a1 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -503,12 +503,6 @@ void WebEditorClient::dismissCorrectionPanel(bool correctionAccepted)
{
notImplemented();
}
-
-bool WebEditorClient::isShowingCorrectionPanel()
-{
- notImplemented();
- return false;
-}
#endif
} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
index 38a3b35..6f89a31 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
@@ -136,7 +136,6 @@ private:
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
virtual void showCorrectionPanel(const WebCore::FloatRect& boundingBoxOfReplacedString, const WTF::String& replacedString, const WTF::String& replacementString, WebCore::Editor*);
virtual void dismissCorrectionPanel(bool correctionAccepted);
- virtual bool isShowingCorrectionPanel();
#endif
WebPage* m_page;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list