Attachment 135730 Details for Bug 82970 – Fixing build on various platforms.

[patch] Fixing build on various platforms.

bug-82970-20120404173724.patch (text/plain), 61.88 KB, created by Jia Pu on 2012-04-04 17:37:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jia Pu

Created: 2012-04-04 17:37:27 PDT

Size: 61.88 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 113261)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,41 @@
>+2012-04-04  Jia Pu  <jpu@apple.com>
>+
>+        Move correction panel related functions in EditorClient into separated AlternativeTextClient class.
>+        https://bugs.webkit.org/show_bug.cgi?id=82970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests, since there's no change of functionality.
>+
>+        The existing correction panel related functions in EditorClient are currently used only by OS X.
>+        We'd like to move them into separate AlternativeTextClient class to avoid using #ifdef's. This
>+        new client class will also hold dictation alternative related interface that we will add soon for
>+        bug 82503. 
>+
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * editing/AlternativeTextController.cpp:
>+        (WebCore::AlternativeTextController::show):
>+        (WebCore::AlternativeTextController::dismiss):
>+        (WebCore::AlternativeTextController::dismissSoon):
>+        (WebCore::AlternativeTextController::respondToUnappliedSpellCorrection):
>+        (WebCore::AlternativeTextController::timerFired):
>+        (WebCore::AlternativeTextController::recordAutocorrectionResponseReversed):
>+        (WebCore::AlternativeTextController::recordSpellcheckerResponseForModifiedCorrection):
>+        * editing/AlternativeTextController.h:
>+        (WebCore):
>+        * editing/TextCheckingHelper.h:
>+        (WebCore):
>+        * loader/EmptyClients.h:
>+        (WebCore::EmptyEditorClient::alternativeTextClient):
>+        (EmptyEditorClient):
>+        * page/EditorClient.h:
>+        (WebCore):
>+        (EditorClient):
>+        * platform/text/AlternativeTextClient.h: Added.
>+        (WebCore):
>+        (AlternativeTextClient):
>+        (WebCore::AlternativeTextClient::~AlternativeTextClient):
>+
> 2012-04-04  Dan Bernstein  <mitz@apple.com>
> 
>         Paginated webviews render nothing in their gutters
>Index: Source/WebCore/WebCore.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebCore/WebCore.xcodeproj/project.pbxproj	(revision 113251)
>+++ Source/WebCore/WebCore.xcodeproj/project.pbxproj	(working copy)
>@@ -5733,11 +5733,12 @@
> 		CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */; };
> 		CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CE08C3D1152B599A0021B8C2 /* AlternativeTextController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */; };
>-		CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
> 		CE54FD381016D9A6008B44C8 /* ScriptSourceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = CE54FD371016D9A6008B44C8 /* ScriptSourceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CEA3949C11D45CDA003094CF /* StaticHashSetNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3949A11D45CDA003094CF /* StaticHashSetNodeList.cpp */; };
> 		CEA3949D11D45CDA003094CF /* StaticHashSetNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */; };
> 		CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */ = {isa = PBXBuildFile; fileRef = CECCFC3A141973D5002A0AC1 /* DecodeEscapeSequences.h */; };
>+		CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CEF418CE1179678C009D112C /* ViewportArguments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEF418CC1179678C009D112C /* ViewportArguments.cpp */; };
> 		CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = CEF418CD1179678C009D112C /* ViewportArguments.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D000EBA011BDAFD400C47726 /* FrameLoaderStateMachine.cpp */; };
>@@ -12841,6 +12842,7 @@
> 		CEA3949A11D45CDA003094CF /* StaticHashSetNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StaticHashSetNodeList.cpp; sourceTree = "<group>"; };
> 		CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticHashSetNodeList.h; sourceTree = "<group>"; };
> 		CECCFC3A141973D5002A0AC1 /* DecodeEscapeSequences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecodeEscapeSequences.h; sourceTree = "<group>"; };
>+		CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextClient.h; sourceTree = "<group>"; };
> 		CEF418CC1179678C009D112C /* ViewportArguments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportArguments.cpp; sourceTree = "<group>"; };
> 		CEF418CD1179678C009D112C /* ViewportArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportArguments.h; sourceTree = "<group>"; };
> 		D000EBA011BDAFD400C47726 /* FrameLoaderStateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoaderStateMachine.cpp; sourceTree = "<group>"; };
>@@ -19377,6 +19379,7 @@
> 				B2B264590D00A77E000ACC1D /* cf */,
> 				B2C3D9F90D006C1D00EF6F26 /* mac */,
> 				B734B17F119B98DB006587BD /* transcoder */,
>+				CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */,
> 				37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */,
> 				B2C3D9F00D006C1D00EF6F26 /* Base64.cpp */,
> 				B2C3D9F10D006C1D00EF6F26 /* Base64.h */,
>@@ -24722,6 +24725,7 @@
> 				CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */,
> 				A07D3356152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h in Headers */,
> 				A07D3358152B632D001B6393 /* WebGLShaderPrecisionFormat.h in Headers */,
>+				CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>Index: Source/WebCore/editing/AlternativeTextController.cpp
>===================================================================
>--- Source/WebCore/editing/AlternativeTextController.cpp	(revision 113251)
>+++ Source/WebCore/editing/AlternativeTextController.cpp	(working copy)
>@@ -178,7 +178,7 @@ void AlternativeTextController::show(Pas
>     m_alternativeTextInfo.rangeWithAlternative = rangeToReplace;
>     m_alternativeTextInfo.details = AutocorrectionAlternativeDetails::create(replacement);
>     m_alternativeTextInfo.isActive = true;
>-    client()->showCorrectionPanel(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, replacement, Vector<String>());
>+    client()->alternativeTextClient()->showCorrectionAlternative(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, replacement, Vector<String>());
> }
> 
> void AlternativeTextController::handleCancelOperation()
>@@ -196,7 +196,7 @@ void AlternativeTextController::dismiss(
>     m_alternativeTextInfo.isActive = false;
>     m_isDismissedByEditing = true;
>     if (client())
>-        client()->dismissCorrectionPanel(reasonForDismissing);
>+        client()->alternativeTextClient()->dismissAlternative(reasonForDismissing);
> }
> 
> String AlternativeTextController::dismissSoon(ReasonForDismissingAlternativeText reasonForDismissing)
>@@ -207,7 +207,7 @@ String AlternativeTextController::dismis
>     m_isDismissedByEditing = true;
>     if (!client())
>         return String();
>-    return client()->dismissCorrectionPanelSoon(reasonForDismissing);
>+    return client()->alternativeTextClient()->dismissAlternativeSoon(reasonForDismissing);
> }
> 
> void AlternativeTextController::applyAlternativeText(const String& alternative, const Vector<DocumentMarker::MarkerType>& markerTypesToAdd)
>@@ -286,7 +286,7 @@ bool AlternativeTextController::applyAut
> 
> void AlternativeTextController::respondToUnappliedSpellCorrection(const VisibleSelection& selectionOfCorrected, const String& corrected, const String& correction)
> {
>-    client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, corrected, correction);
>+    client()->alternativeTextClient()->recordAutocorrectionResponse(AutocorrectionReverted, corrected, correction);
>     m_frame->document()->updateLayout();
>     m_frame->selection()->setSelection(selectionOfCorrected, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | FrameSelection::SpellCorrectionTriggered);
>     RefPtr<Range> range = Range::create(m_frame->document(), m_frame->selection()->selection().start(), m_frame->selection()->selection().end());
>@@ -317,7 +317,7 @@ void AlternativeTextController::timerFir
>         FloatRect boundingBox = rootViewRectForRange(m_alternativeTextInfo.rangeWithAlternative.get());
>         if (!boundingBox.isEmpty()) {
>             const AutocorrectionAlternativeDetails* details = static_cast<const AutocorrectionAlternativeDetails*>(m_alternativeTextInfo.details.get());
>-            client()->showCorrectionPanel(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, details->replacementString(), Vector<String>());
>+            client()->alternativeTextClient()->showCorrectionAlternative(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, details->replacementString(), Vector<String>());
>         }
>     }
>         break;
>@@ -336,7 +336,7 @@ void AlternativeTextController::timerFir
>         m_alternativeTextInfo.isActive = true;
>         FloatRect boundingBox = rootViewRectForRange(m_alternativeTextInfo.rangeWithAlternative.get());
>         if (!boundingBox.isEmpty())
>-            client()->showCorrectionPanel(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, topSuggestion, suggestions);
>+            client()->alternativeTextClient()->showCorrectionAlternative(m_alternativeTextInfo.type, boundingBox, m_alternativeTextInfo.originalText, topSuggestion, suggestions);
>     }
>         break;
>     }
>@@ -477,7 +477,7 @@ TextCheckerClient* AlternativeTextContro
> 
> void AlternativeTextController::recordAutocorrectionResponseReversed(const String& replacedString, const String& replacementString)
> {
>-    client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, replacedString, replacementString);
>+    client()->alternativeTextClient()->recordAutocorrectionResponse(AutocorrectionReverted, replacedString, replacementString);
> }
> 
> void AlternativeTextController::recordAutocorrectionResponseReversed(const String& replacedString, PassRefPtr<Range> replacementRange)
>@@ -516,9 +516,9 @@ void AlternativeTextController::recordSp
>     // Spelling corrected text has been edited. We need to determine whether user has reverted it to original text or
>     // edited it to something else, and notify spellchecker accordingly.
>     if (markersHaveIdenticalDescription(correctedOnceMarkers) && correctedOnceMarkers[0]->description() == corrected)
>-        client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, corrected, correction);
>+        client()->alternativeTextClient()->recordAutocorrectionResponse(AutocorrectionReverted, corrected, correction);
>     else
>-        client()->recordAutocorrectionResponse(EditorClient::AutocorrectionEdited, corrected, correction);
>+        client()->alternativeTextClient()->recordAutocorrectionResponse(AutocorrectionEdited, corrected, correction);
>     markers->removeMarkers(rangeOfCorrection, DocumentMarker::Autocorrected, DocumentMarkerController::RemovePartiallyOverlappingMarker);
> }
> 
>Index: Source/WebCore/editing/AlternativeTextController.h
>===================================================================
>--- Source/WebCore/editing/AlternativeTextController.h	(revision 113251)
>+++ Source/WebCore/editing/AlternativeTextController.h	(working copy)
>@@ -26,6 +26,7 @@
> #ifndef AlternativeTextController_h
> #define AlternativeTextController_h
> 
>+#include "AlternativeTextClient.h"
> #include "DocumentMarker.h"
> #include "Range.h"
> #include "TextChecking.h"
>@@ -49,12 +50,6 @@ public:
>     virtual ~AlternativeTextDetails() { }
> };
> 
>-enum AlternativeTextType {
>-    AlternativeTextTypeCorrection = 0,
>-    AlternativeTextTypeReversion,
>-    AlternativeTextTypeSpellingSuggestions,
>-};
>-
> struct AlternativeTextInfo {
>     RefPtr<Range> rangeWithAlternative;
>     bool isActive;
>@@ -65,12 +60,6 @@ struct AlternativeTextInfo {
> 
> struct TextCheckingResult;
> 
>-enum ReasonForDismissingAlternativeText {
>-    ReasonForDismissingAlternativeTextCancelled = 0,
>-    ReasonForDismissingAlternativeTextIgnored,
>-    ReasonForDismissingAlternativeTextAccepted
>-};
>-
> #if USE(AUTOCORRECTION_PANEL)
> // These backslashes are for making style checker happy.
> #define UNLESS_ENABLED(functionBody) \
>Index: Source/WebCore/editing/TextCheckingHelper.h
>===================================================================
>--- Source/WebCore/editing/TextCheckingHelper.h	(revision 113251)
>+++ Source/WebCore/editing/TextCheckingHelper.h	(working copy)
>@@ -22,11 +22,15 @@
> #define TextCheckingHelper_h
> 
> #include "EditorClient.h"
>+#include "ExceptionCode.h"
>+#include "TextChecking.h"
>+#include <wtf/text/WTFString.h>
> 
> namespace WebCore {
> 
> class Range;
> class Position;
>+struct TextCheckingResult;
> 
> class TextCheckingParagraph {
> public:
>Index: Source/WebCore/loader/EmptyClients.h
>===================================================================
>--- Source/WebCore/loader/EmptyClients.h	(revision 113251)
>+++ Source/WebCore/loader/EmptyClients.h	(working copy)
>@@ -28,6 +28,7 @@
> #ifndef EmptyClients_h
> #define EmptyClients_h
> 
>+#include "AlternativeTextClient.h"
> #include "ChromeClient.h"
> #include "ContextMenuClient.h"
> #include "DeviceMotionClient.h"
>@@ -519,12 +520,6 @@ public:
> #endif
>     TextCheckerClient* textChecker() { return &m_textCheckerClient; }
> 
>-#if USE(AUTOCORRECTION_PANEL)
>-    virtual void showCorrectionPanel(AlternativeTextType, const FloatRect&, const String&, const String&, const Vector<String>&) { }
>-    virtual void dismissCorrectionPanel(ReasonForDismissingAlternativeText) { }
>-    virtual String dismissCorrectionPanelSoon(ReasonForDismissingAlternativeText) { return String(); }
>-    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String&, const String&) { }
>-#endif
>     virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&) { }
>     virtual void updateSpellingUIWithMisspelledWord(const String&) { }
>     virtual void showSpellingUI(bool) { }
>Index: Source/WebCore/page/EditorClient.h
>===================================================================
>--- Source/WebCore/page/EditorClient.h	(revision 113251)
>+++ Source/WebCore/page/EditorClient.h	(working copy)
>@@ -27,7 +27,6 @@
> #ifndef EditorClient_h
> #define EditorClient_h
> 
>-#include "AlternativeTextController.h"
> #include "EditorInsertAction.h"
> #include "FloatRect.h"
> #include "TextAffinity.h"
>@@ -43,6 +42,7 @@ OBJC_CLASS NSURL;
> 
> namespace WebCore {
> 
>+class AlternativeTextClient;
> class ArchiveResource;
> class DocumentFragment;
> class Editor;
>@@ -145,18 +145,7 @@ public:
> #endif
> 
>     virtual TextCheckerClient* textChecker() = 0;
>-
>-    enum AutocorrectionResponseType {
>-        AutocorrectionEdited,
>-        AutocorrectionReverted
>-    };
>-
>-#if USE(AUTOCORRECTION_PANEL)
>-    virtual void showCorrectionPanel(AlternativeTextType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacmentString, const Vector<String>& alternativeReplacementStrings) = 0;
>-    virtual void dismissCorrectionPanel(ReasonForDismissingAlternativeText) = 0;
>-    virtual String dismissCorrectionPanelSoon(ReasonForDismissingAlternativeText) = 0;
>-    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
>-#endif
>+    virtual AlternativeTextClient* alternativeTextClient() { return 0; };
> 
>     virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail& detail) = 0;
>     virtual void updateSpellingUIWithMisspelledWord(const String&) = 0;
>Index: Source/WebCore/platform/text/AlternativeTextClient.h
>===================================================================
>--- Source/WebCore/platform/text/AlternativeTextClient.h	(revision 0)
>+++ Source/WebCore/platform/text/AlternativeTextClient.h	(revision 0)
>@@ -0,0 +1,63 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef AlternativeTextClient_h
>+#define AlternativeTextClient_h
>+
>+#include "FloatRect.h"
>+#include <wtf/Vector.h>
>+#include <wtf/text/WTFString.h>
>+
>+namespace WebCore {
>+
>+enum ReasonForDismissingAlternativeText {
>+    ReasonForDismissingAlternativeTextCancelled = 0,
>+    ReasonForDismissingAlternativeTextIgnored,
>+    ReasonForDismissingAlternativeTextAccepted
>+};
>+
>+enum AlternativeTextType {
>+    AlternativeTextTypeCorrection = 0,
>+    AlternativeTextTypeReversion,
>+    AlternativeTextTypeSpellingSuggestions,
>+};
>+
>+enum AutocorrectionResponseType {
>+    AutocorrectionEdited,
>+    AutocorrectionReverted
>+};
>+
>+class AlternativeTextClient {
>+public:
>+    virtual ~AlternativeTextClient() { }
>+    virtual void showCorrectionAlternative(AlternativeTextType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacmentString, const Vector<String>& alternativeReplacementStrings) = 0;
>+    virtual void dismissAlternative(ReasonForDismissingAlternativeText) = 0;
>+    virtual String dismissAlternativeSoon(ReasonForDismissingAlternativeText) = 0;
>+    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
>+};
>+    
>+}
>+
>+#endif // AlternativeTextClient_h
>Index: Source/WebKit2/ChangeLog
>===================================================================
>--- Source/WebKit2/ChangeLog	(revision 113261)
>+++ Source/WebKit2/ChangeLog	(working copy)
>@@ -1,3 +1,45 @@
>+2012-04-04  Jia Pu  <jpu@apple.com>
>+
>+        Move correction panel related functions in EditorClient into separated AlternativeTextClient class.
>+        https://bugs.webkit.org/show_bug.cgi?id=82970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move correction panel related functions from WebEditorClient to the new WebAlternativeTextClient.
>+        See WebCore/ChangeLog for details.
>+
>+        * UIProcess/API/mac/PageClientImpl.h:
>+        (PageClientImpl):
>+        * UIProcess/API/mac/PageClientImpl.mm:
>+        (WebKit::PageClientImpl::recordAutocorrectionResponse):
>+        * UIProcess/PageClient.h:
>+        (PageClient):
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::recordAutocorrectionResponse):
>+        * UIProcess/mac/CorrectionPanel.h:
>+        * WebKit2.xcodeproj/project.pbxproj:
>+        * WebProcess/WebCoreSupport/WebAlternativeTextClient.cpp: Added.
>+        (WebKit):
>+        (WebKit::WebAlternativeTextClient::WebAlternativeTextClient):
>+        (WebKit::WebAlternativeTextClient::~WebAlternativeTextClient):
>+        (WebKit::WebAlternativeTextClient::showCorrectionAlternative):
>+        (WebKit::WebAlternativeTextClient::dismissAlternative):
>+        (WebKit::WebAlternativeTextClient::dismissAlternativeSoon):
>+        (WebKit::WebAlternativeTextClient::recordAutocorrectionResponse):
>+        * WebProcess/WebCoreSupport/WebAlternativeTextClient.h: Added.
>+        (WebKit):
>+        (WebAlternativeTextClient):
>+        (WebKit::WebAlternativeTextClient::create):
>+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
>+        (WebKit::WebEditorClient::WebEditorClient):
>+        (WebKit):
>+        (WebKit::WebEditorClient::alternativeTextClient):
>+        * WebProcess/WebCoreSupport/WebEditorClient.h:
>+        (WebKit):
>+        (WebEditorClient):
>+        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
>+        (WebKit):
>+
> 2012-04-04  Anders Carlsson  <andersca@apple.com>
> 
>         Text input doesn't work for some Flash forms
>Index: Source/WebKit2/UIProcess/PageClient.h
>===================================================================
>--- Source/WebKit2/UIProcess/PageClient.h	(revision 113251)
>+++ Source/WebKit2/UIProcess/PageClient.h	(working copy)
>@@ -29,7 +29,7 @@
> #include "ShareableBitmap.h"
> #include "WebPageProxy.h"
> #include "WebPopupMenuProxy.h"
>-#include <WebCore/AlternativeTextController.h>
>+#include <WebCore/AlternativeTextClient.h>
> #include <WebCore/EditorClient.h>
> #include <wtf/Forward.h>
> 
>@@ -188,7 +188,7 @@ public:
>     virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) = 0;
>     virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) = 0;
>     virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) = 0;
>-    virtual void recordAutocorrectionResponse(WebCore::EditorClient::AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
>+    virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
>     virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) = 0;
>     
>     virtual WKView* wkView() const = 0;
>Index: Source/WebKit2/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/WebPageProxy.cpp	(revision 113251)
>+++ Source/WebKit2/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -3738,7 +3738,7 @@ void WebPageProxy::dismissCorrectionPane
> 
> void WebPageProxy::recordAutocorrectionResponse(int32_t responseType, const String& replacedString, const String& replacementString)
> {
>-    m_pageClient->recordAutocorrectionResponse((EditorClient::AutocorrectionResponseType)responseType, replacedString, replacementString);
>+    m_pageClient->recordAutocorrectionResponse((AutocorrectionResponseType)responseType, replacedString, replacementString);
> }
> #endif // !defined(BUILDING_ON_SNOW_LEOPARD)
> 
>Index: Source/WebKit2/UIProcess/API/mac/PageClientImpl.h
>===================================================================
>--- Source/WebKit2/UIProcess/API/mac/PageClientImpl.h	(revision 113251)
>+++ Source/WebKit2/UIProcess/API/mac/PageClientImpl.h	(working copy)
>@@ -123,7 +123,7 @@ private:
>     virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
>     virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText);
>     virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText);
>-    virtual void recordAutocorrectionResponse(WebCore::EditorClient::AutocorrectionResponseType, const String& replacedString, const String& replacementString);
>+    virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString);
> 
>     virtual void recommendedScrollbarStyleDidChange(int32_t newStyle);
> 
>Index: Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
>===================================================================
>--- Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm	(revision 113251)
>+++ Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm	(working copy)
>@@ -488,10 +488,10 @@ String PageClientImpl::dismissCorrection
> #endif
> }
> 
>-void PageClientImpl::recordAutocorrectionResponse(EditorClient::AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
>+void PageClientImpl::recordAutocorrectionResponse(AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
> {
> #if !defined(BUILDING_ON_SNOW_LEOPARD)
>-    NSCorrectionResponse response = responseType == EditorClient::AutocorrectionReverted ? NSCorrectionResponseReverted : NSCorrectionResponseEdited;
>+    NSCorrectionResponse response = responseType == AutocorrectionReverted ? NSCorrectionResponseReverted : NSCorrectionResponseEdited;
>     CorrectionPanel::recordAutocorrectionResponse(m_wkView, response, replacedString, replacementString);
> #endif
> }
>Index: Source/WebKit2/UIProcess/mac/CorrectionPanel.h
>===================================================================
>--- Source/WebKit2/UIProcess/mac/CorrectionPanel.h	(revision 113251)
>+++ Source/WebKit2/UIProcess/mac/CorrectionPanel.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if !defined(BUILDING_ON_SNOW_LEOPARD)
> #import <AppKit/NSSpellChecker.h>
>-#import <WebCore/AlternativeTextController.h>
>+#import <WebCore/AlternativeTextClient.h>
> #import <wtf/RetainPtr.h>
> 
> @class WKView;
>Index: Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	(revision 113251)
>+++ Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	(working copy)
>@@ -883,6 +883,8 @@
> 		CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
> 		CDCA85D5132AC2B300E961DF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCA85D4132AC2B300E961DF /* IOKit.framework */; };
> 		CDCA85EE132AD70100E961DF /* WebFullScreenManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85DE132AD05300E961DF /* WebFullScreenManagerProxyMac.mm */; };
>+		CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */; };
>+		CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
> 		D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */; };
> 		D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
> 		D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */; };
>@@ -1937,6 +1939,8 @@
> 		CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullScreenWindowController.h; sourceTree = "<group>"; };
> 		CDCA85D4132AC2B300E961DF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
> 		CDCA85DE132AD05300E961DF /* WebFullScreenManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFullScreenManagerProxyMac.mm; sourceTree = "<group>"; };
>+		CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
>+		CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
> 		D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
> 		D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
> 		D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
>@@ -2769,6 +2773,8 @@
> 			isa = PBXGroup;
> 			children = (
> 				BC111ADE112F5B9A00337BAB /* mac */,
>+				CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */,
>+				CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */,
> 				BC111A53112F4FBB00337BAB /* WebChromeClient.cpp */,
> 				BC032D6010F4378D0058C15A /* WebChromeClient.h */,
> 				BC111A54112F4FBB00337BAB /* WebContextMenuClient.cpp */,
>@@ -4178,6 +4184,7 @@
> 				37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
> 				37948404150C350600E52CE9 /* WebRenderLayer.h in Headers */,
> 				37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
>+				CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -4921,6 +4928,7 @@
> 				37608822150414F700FC82C7 /* WKRenderObject.cpp in Sources */,
> 				37948403150C350600E52CE9 /* WebRenderLayer.cpp in Sources */,
> 				37948408150C4B9700E52CE9 /* WKRenderLayer.cpp in Sources */,
>+				CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>Index: Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.cpp	(revision 0)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.cpp	(revision 0)
>@@ -0,0 +1,69 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "WebAlternativeTextClient.h"
>+
>+#include "WebCoreArgumentCoders.h"
>+#include "WebPage.h"
>+#include "WebPageProxyMessages.h"
>+
>+using namespace WebCore;
>+
>+namespace WebKit {
>+
>+WebAlternativeTextClient::WebAlternativeTextClient(WebPage* webPage)
>+: m_page(webPage)
>+{
>+}
>+
>+WebAlternativeTextClient::~WebAlternativeTextClient()
>+{
>+    m_page->send(Messages::WebPageProxy::DismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored));
>+}
>+
>+void WebAlternativeTextClient::showCorrectionAlternative(AlternativeTextType type, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
>+{
>+    m_page->send(Messages::WebPageProxy::ShowCorrectionPanel(type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings));
>+}
>+
>+void WebAlternativeTextClient::dismissAlternative(ReasonForDismissingAlternativeText reason)
>+{
>+    m_page->send(Messages::WebPageProxy::DismissCorrectionPanel(reason));
>+}
>+
>+String WebAlternativeTextClient::dismissAlternativeSoon(ReasonForDismissingAlternativeText reason)
>+{
>+    String result;
>+    m_page->sendSync(Messages::WebPageProxy::DismissCorrectionPanelSoon(reason), Messages::WebPageProxy::DismissCorrectionPanelSoon::Reply(result));
>+    return result;
>+}
>+
>+void WebAlternativeTextClient::recordAutocorrectionResponse(AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
>+{
>+    m_page->send(Messages::WebPageProxy::RecordAutocorrectionResponse(responseType, replacedString, replacementString));
>+}
>+
>+}
>Index: Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h	(revision 0)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h	(revision 0)
>@@ -0,0 +1,55 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+
>+#ifndef WebAlternativeTextClient_h
>+#define WebAlternativeTextClient_h
>+
>+#import <WebCore/AlternativeTextClient.h>
>+#import <wtf/PassOwnPtr.h>
>+
>+namespace WebKit {
>+
>+class WebPage;
>+
>+class WebAlternativeTextClient : public WebCore::AlternativeTextClient {
>+public:
>+    static PassOwnPtr<WebAlternativeTextClient> create(WebPage* webPage)
>+    {
>+        return WTF::adoptPtr(new WebAlternativeTextClient(webPage));
>+    }
>+    virtual ~WebAlternativeTextClient();
>+    virtual void showCorrectionAlternative(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
>+    virtual void dismissAlternative(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>+    virtual String dismissAlternativeSoon(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>+    virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
>+private:
>+    WebAlternativeTextClient(WebPage *);
>+    WebPage *m_page;
>+};
>+
>+}
>+
>+#endif // WebAlternativeTextClient_h
>Index: Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp	(revision 113251)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp	(working copy)
>@@ -27,6 +27,7 @@
> #include "WebEditorClient.h"
> 
> #include "EditorState.h"
>+#include "WebAlternativeTextClient.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebFrameLoaderClient.h"
> #include "WebPage.h"
>@@ -53,6 +54,12 @@ using namespace HTMLNames;
> 
> namespace WebKit {
> 
>+WebEditorClient::WebEditorClient(WebPage* page)
>+: m_page(page)
>+, m_alternativeTextClient(WebAlternativeTextClient::create(page))
>+{
>+}
>+
> void WebEditorClient::pageDestroyed()
> {
>     delete this;
>@@ -452,4 +459,9 @@ void WebEditorClient::requestCheckingOfS
>     notImplemented();
> }
> 
>+AlternativeTextClient* WebEditorClient::alternativeTextClient()
>+{
>+    return m_alternativeTextClient.get();
>+}
>+
> } // namespace WebKit
>Index: Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h	(revision 113251)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h	(working copy)
>@@ -26,19 +26,18 @@
> #ifndef WebEditorClient_h
> #define WebEditorClient_h
> 
>+#include <WebCore/AlternativeTextClient.h>
> #include <WebCore/EditorClient.h>
> #include <WebCore/TextCheckerClient.h>
> 
> namespace WebKit {
> 
>+class WebAlternativeTextClient;
> class WebPage;
> 
> class WebEditorClient : public WebCore::EditorClient, public WebCore::TextCheckerClient {
> public:
>-    WebEditorClient(WebPage* page)
>-        : m_page(page)
>-    {
>-    }
>+    WebEditorClient(WebPage*);
> 
> private:
>     virtual void pageDestroyed() OVERRIDE;
>@@ -125,6 +124,7 @@ private:
> #endif
> 
>     TextCheckerClient* textChecker()  OVERRIDE { return this; }
>+    WebCore::AlternativeTextClient* alternativeTextClient() OVERRIDE;
> 
>     virtual void ignoreWordInSpellDocument(const String&) OVERRIDE;
>     virtual void learnWord(const String&) OVERRIDE;
>@@ -142,16 +142,11 @@ private:
>     virtual void willSetInputMethodState() OVERRIDE;
>     virtual void setInputMethodState(bool enabled) OVERRIDE;
>     virtual void requestCheckingOfString(WebCore::SpellChecker*, const WebCore::TextCheckingRequest&) OVERRIDE;
>-#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
>-    virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
>-    virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>-    virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>-    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
>-#endif
> #if PLATFORM(GTK)
>     virtual bool shouldShowUnicodeMenu() OVERRIDE;
> #endif
>     WebPage* m_page;
>+    OwnPtr<WebAlternativeTextClient> m_alternativeTextClient;
> };
> 
> } // namespace WebKit
>Index: Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm	(revision 113251)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm	(working copy)
>@@ -238,28 +238,4 @@ void WebEditorClient::checkTextOfParagra
>     m_page->sendSync(Messages::WebPageProxy::CheckTextOfParagraph(String(text, length), checkingTypes), Messages::WebPageProxy::CheckTextOfParagraph::Reply(results));
> }
> 
>-#if !defined(BUILDING_ON_SNOW_LEOPARD)
>-void WebEditorClient::showCorrectionPanel(WebCore::AlternativeTextType type, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
>-{
>-    m_page->send(Messages::WebPageProxy::ShowCorrectionPanel(type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings));
>-}
>-
>-void WebEditorClient::dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText reason)
>-{
>-    m_page->send(Messages::WebPageProxy::DismissCorrectionPanel(reason));
>-}
>-
>-String WebEditorClient::dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText reason)
>-{
>-    String result;
>-    m_page->sendSync(Messages::WebPageProxy::DismissCorrectionPanelSoon(reason), Messages::WebPageProxy::DismissCorrectionPanelSoon::Reply(result));
>-    return result;
>-}
>-
>-void WebEditorClient::recordAutocorrectionResponse(EditorClient::AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
>-{
>-    m_page->send(Messages::WebPageProxy::RecordAutocorrectionResponse(responseType, replacedString, replacementString));
>-}
>-#endif
>-
> } // namespace WebKit
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 113261)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2012-04-04  Jia Pu  <jpu@apple.com>
>+
>+        Move correction panel related functions in EditorClient into separated AlternativeTextClient class.
>+        https://bugs.webkit.org/show_bug.cgi?id=82970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        See WebCore/ChangeLog for details.
>+
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2012-04-01  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
> 
>         Support the Network Information API
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 113251)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -370,6 +370,8 @@
> 		CD8EAC7311CAC9A300774075 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD8EAC7211CAC9A300774075 /* IOKit.framework */; };
> 		CDA62AE2125F87C2007FD118 /* WebFullScreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA62AE0125F87C2007FD118 /* WebFullScreenController.h */; };
> 		CDA62AE3125F87C2007FD118 /* WebFullScreenController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA62AE1125F87C2007FD118 /* WebFullScreenController.mm */; };
>+		CEDA12DB152CBE6800D9E08D /* WebAlternativeTextClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = CEDA12D9152CBE6800D9E08D /* WebAlternativeTextClient.mm */; };
>+		CEDA12DC152CBE6800D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DA152CBE6800D9E08D /* WebAlternativeTextClient.h */; };
> 		DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */; };
> 		DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
> 		DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
>@@ -699,6 +701,8 @@
> 		CD8EAC7211CAC9A300774075 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
> 		CDA62AE0125F87C2007FD118 /* WebFullScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFullScreenController.h; sourceTree = "<group>"; };
> 		CDA62AE1125F87C2007FD118 /* WebFullScreenController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFullScreenController.mm; sourceTree = "<group>"; };
>+		CEDA12D9152CBE6800D9E08D /* WebAlternativeTextClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebAlternativeTextClient.mm; sourceTree = "<group>"; };
>+		CEDA12DA152CBE6800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
> 		DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTypesInternal.h; sourceTree = "<group>"; };
> 		DD89681E09AA87240097E7F0 /* WebElementDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebElementDictionary.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
> 		DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebElementDictionary.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
>@@ -1294,6 +1298,8 @@
> 			children = (
> 				B82958D1132707D0000D0E79 /* CorrectionPanel.h */,
> 				B82958D2132707D0000D0E79 /* CorrectionPanel.mm */,
>+				CEDA12D9152CBE6800D9E08D /* WebAlternativeTextClient.mm */,
>+				CEDA12DA152CBE6800D9E08D /* WebAlternativeTextClient.h */,
> 				B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */,
> 				B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */,
> 				A5DEFC1111D5344B00885273 /* WebApplicationCacheQuotaManager.h */,
>@@ -1643,6 +1649,7 @@
> 				41F4484F10338E8C0030E55E /* WebWorkersPrivate.h in Headers */,
> 				312E2FE514E48182007CCA18 /* WebNotification.h in Headers */,
> 				312E2FE914E48215007CCA18 /* WebNotificationInternal.h in Headers */,
>+				CEDA12DC152CBE6800D9E08D /* WebAlternativeTextClient.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -2030,6 +2037,7 @@
> 				BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */,
> 				41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */,
> 				312E2FE614E48182007CCA18 /* WebNotification.mm in Sources */,
>+				CEDA12DB152CBE6800D9E08D /* WebAlternativeTextClient.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>Index: Source/WebKit/mac/ChangeLog
>===================================================================
>--- Source/WebKit/mac/ChangeLog	(revision 113261)
>+++ Source/WebKit/mac/ChangeLog	(working copy)
>@@ -1,3 +1,31 @@
>+2012-04-04  Jia Pu  <jpu@apple.com>
>+
>+        Move correction panel related functions in EditorClient into separated AlternativeTextClient class.
>+        https://bugs.webkit.org/show_bug.cgi?id=82970
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move correction panel related functions from WebEditorClient to the new WebAlternativeTextClient.
>+        See WebCore/ChangeLog for details.
>+
>+        * WebCoreSupport/CorrectionPanel.h:
>+        * WebCoreSupport/CorrectionPanel.mm:
>+        * WebCoreSupport/WebAlternativeTextClient.h: Added.
>+        (WebAlternativeTextClient):
>+        (WebAlternativeTextClient::create):
>+        * WebCoreSupport/WebAlternativeTextClient.mm: Added.
>+        (WebAlternativeTextClient::WebAlternativeTextClient):
>+        (WebAlternativeTextClient::~WebAlternativeTextClient):
>+        (WebAlternativeTextClient::showCorrectionAlternative):
>+        (WebAlternativeTextClient::dismissAlternative):
>+        (WebAlternativeTextClient::dismissAlternativeSoon):
>+        (WebAlternativeTextClient::recordAutocorrectionResponse):
>+        * WebCoreSupport/WebEditorClient.h:
>+        * WebCoreSupport/WebEditorClient.mm:
>+        (WebEditorClient::WebEditorClient):
>+        (WebEditorClient::~WebEditorClient):
>+        (WebEditorClient::alternativeTextClient):
>+
> 2012-03-15  Jer Noble  <jer.noble@apple.com>
> 
>         Full Screen mode should cancel before navigation.
>Index: Source/WebKit/mac/WebCoreSupport/CorrectionPanel.h
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/CorrectionPanel.h	(revision 113251)
>+++ Source/WebKit/mac/WebCoreSupport/CorrectionPanel.h	(working copy)
>@@ -26,11 +26,12 @@
> #ifndef CorrectionPanel_h
> #define CorrectionPanel_h
> 
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
> #import <AppKit/NSSpellChecker.h>
>-#import <WebCore/AlternativeTextController.h>
>+#import <WebCore/AlternativeTextClient.h>
> #import <wtf/RetainPtr.h>
> 
>+#if USE(AUTOCORRECTION_PANEL)
>+
> @class WebView;
> 
> class CorrectionPanel {
>@@ -53,6 +54,6 @@ private:
>     RetainPtr<NSString> m_resultForDismissal;
> };
> 
>-#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>+#endif // USE(AUTOCORRECTION_PANEL)
> 
> #endif // CorrectionPanel_h
>Index: Source/WebKit/mac/WebCoreSupport/CorrectionPanel.mm
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/CorrectionPanel.mm	(revision 113251)
>+++ Source/WebKit/mac/WebCoreSupport/CorrectionPanel.mm	(working copy)
>@@ -27,7 +27,7 @@
> #import "WebViewInternal.h"
> #import "WebViewPrivate.h"
> 
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>+#if USE(AUTOCORRECTION_PANEL)
> using namespace WebCore;
> 
> static inline NSCorrectionIndicatorType correctionIndicatorType(AlternativeTextType alternativeTextType)
>@@ -137,5 +137,5 @@ void CorrectionPanel::handleAcceptedRepl
>         m_resultForDismissal.adoptNS([acceptedReplacement copy]);
> }
> 
>-#endif // !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>+#endif //USE(AUTOCORRECTION_PANEL)
> 
>Index: Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h	(revision 0)
>+++ Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h	(revision 0)
>@@ -0,0 +1,55 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+
>+#ifndef WebAlternativeTextClient_h
>+#define WebAlternativeTextClient_h
>+
>+#import "CorrectionPanel.h"
>+#import <WebCore/AlternativeTextClient.h>
>+#import <wtf/PassOwnPtr.h>
>+
>+@class WebView;
>+
>+class WebAlternativeTextClient : public WebCore::AlternativeTextClient {
>+public:
>+    static PassOwnPtr<WebAlternativeTextClient> create(WebView* webView)
>+    {
>+        return WTF::adoptPtr(new WebAlternativeTextClient(webView));
>+    }
>+    virtual ~WebAlternativeTextClient();
>+    virtual void showCorrectionAlternative(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
>+    virtual void dismissAlternative(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>+    virtual String dismissAlternativeSoon(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>+    virtual void recordAutocorrectionResponse(WebCore::AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
>+private:
>+    WebAlternativeTextClient(WebView *);
>+    WebView* m_webView;
>+#if USE(AUTOCORRECTION_PANEL)
>+    CorrectionPanel m_correctionPanel;
>+#endif
>+};
>+
>+#endif // WebAlternativeTextClient_h
>Index: Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm	(revision 0)
>+++ Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm	(revision 0)
>@@ -0,0 +1,71 @@
>+/*
>+ * Copyright (C) 2012 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "WebAlternativeTextClient.h"
>+
>+using namespace WebCore;
>+
>+WebAlternativeTextClient::WebAlternativeTextClient(WebView* webView)
>+: m_webView(webView)
>+{
>+}
>+
>+WebAlternativeTextClient::~WebAlternativeTextClient()
>+{
>+#if USE(AUTOCORRECTION_PANEL)
>+    dismissAlternative(ReasonForDismissingAlternativeTextIgnored);
>+#endif
>+}
>+
>+void WebAlternativeTextClient::showCorrectionAlternative(AlternativeTextType type, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
>+{
>+#if USE(AUTOCORRECTION_PANEL)
>+    m_correctionPanel.show(m_webView, type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
>+#endif
>+}
>+
>+void WebAlternativeTextClient::dismissAlternative(ReasonForDismissingAlternativeText reason)
>+{
>+#if USE(AUTOCORRECTION_PANEL)
>+    m_correctionPanel.dismiss(reason);
>+#endif
>+}
>+
>+String WebAlternativeTextClient::dismissAlternativeSoon(ReasonForDismissingAlternativeText reason)
>+{
>+#if USE(AUTOCORRECTION_PANEL)
>+    return m_correctionPanel.dismiss(reason);
>+#else
>+return String();
>+#endif
>+}
>+
>+void WebAlternativeTextClient::recordAutocorrectionResponse(AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
>+{
>+#if USE(AUTOCORRECTION_PANEL)
>+    NSCorrectionResponse response = responseType == AutocorrectionReverted ? NSCorrectionResponseReverted : NSCorrectionResponseEdited;
>+CorrectionPanel::recordAutocorrectionResponse(m_webView, response, replacedString, replacementString);
>+#endif
>+}
>Index: Source/WebKit/mac/WebCoreSupport/WebEditorClient.h
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/WebEditorClient.h	(revision 113251)
>+++ Source/WebKit/mac/WebCoreSupport/WebEditorClient.h	(working copy)
>@@ -16,7 +16,7 @@
>  *     from this software without specific prior written permission. 
>  *
>  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * EXPRESS OR IMPL@@IED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>@@ -27,13 +27,14 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import "CorrectionPanel.h"
>+#import <WebCore/AlternativeTextClient.h>
> #import <WebCore/EditorClient.h>
> #import <WebCore/TextCheckerClient.h>
> #import <wtf/Forward.h>
> #import <wtf/RetainPtr.h>
> #import <wtf/Vector.h>
> 
>+class WebAlternativeTextClient;
> @class WebView;
> @class WebEditorUndoTarget;
> 
>@@ -96,6 +97,7 @@ public:
> #endif
> 
>     TextCheckerClient* textChecker() OVERRIDE { return this; }
>+    WebCore::AlternativeTextClient* alternativeTextClient() OVERRIDE;
> 
>     virtual void respondToChangedContents() OVERRIDE;
>     virtual void respondToChangedSelection(WebCore::Frame*) OVERRIDE;
>@@ -136,12 +138,6 @@ public:
>     virtual void willSetInputMethodState() OVERRIDE;
>     virtual void setInputMethodState(bool enabled) OVERRIDE;
>     virtual void requestCheckingOfString(WebCore::SpellChecker*, const WebCore::TextCheckingRequest&) OVERRIDE;
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>-    virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) OVERRIDE;
>-    virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>-    virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingAlternativeText) OVERRIDE;
>-    virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String& replacedString, const String& replacementString) OVERRIDE;
>-#endif
> private:
>     void registerUndoOrRedoStep(PassRefPtr<WebCore::UndoStep>, bool isRedo);
>     WebEditorClient();
>@@ -149,8 +145,5 @@ private:
>     WebView *m_webView;
>     RetainPtr<WebEditorUndoTarget> m_undoTarget;
>     bool m_haveUndoRedoOperations;
>-
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>-    CorrectionPanel m_correctionPanel;
>-#endif
>+    OwnPtr<WebAlternativeTextClient> m_alternativeTextClient;
> };
>Index: Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
>===================================================================
>--- Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm	(revision 113251)
>+++ Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm	(working copy)
>@@ -36,6 +36,7 @@
> #import "DOMHTMLTextAreaElementInternal.h"
> #import "DOMNodeInternal.h"
> #import "DOMRangeInternal.h"
>+#import "WebAlternativeTextClient.h"
> #import "WebArchive.h"
> #import "WebDataSourceInternal.h"
> #import "WebDelegateImplementationCaching.h"
>@@ -184,14 +185,12 @@ WebEditorClient::WebEditorClient(WebView
>     : m_webView(webView)
>     , m_undoTarget([[[WebEditorUndoTarget alloc] init] autorelease])
>     , m_haveUndoRedoOperations(false)
>+    , m_alternativeTextClient(WebAlternativeTextClient::create(webView))
> {
> }
> 
> WebEditorClient::~WebEditorClient()
> {
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>-    dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
>-#endif
> }
> 
> bool WebEditorClient::isContinuousSpellCheckingEnabled()
>@@ -866,29 +865,6 @@ void WebEditorClient::updateSpellingUIWi
>     [[NSSpellChecker sharedSpellChecker] updateSpellingPanelWithGrammarString:badGrammarPhrase detail:grammarDetailDict];
> }
> 
>-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
>-void WebEditorClient::showCorrectionPanel(AlternativeTextType panelType, const FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings)
>-{
>-    m_correctionPanel.show(m_webView, panelType, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
>-}
>-
>-void WebEditorClient::dismissCorrectionPanel(ReasonForDismissingAlternativeText reasonForDismissing)
>-{
>-    m_correctionPanel.dismiss(reasonForDismissing);
>-}
>-
>-String WebEditorClient::dismissCorrectionPanelSoon(ReasonForDismissingAlternativeText reasonForDismissing)
>-{
>-    return m_correctionPanel.dismiss(reasonForDismissing);
>-}
>-
>-void WebEditorClient::recordAutocorrectionResponse(EditorClient::AutocorrectionResponseType responseType, const String& replacedString, const String& replacementString)
>-{
>-    NSCorrectionResponse response = responseType == EditorClient::AutocorrectionReverted ? NSCorrectionResponseReverted : NSCorrectionResponseEdited;
>-    CorrectionPanel::recordAutocorrectionResponse(m_webView, response, replacedString, replacementString);
>-}
>-#endif
>-
> void WebEditorClient::updateSpellingUIWithMisspelledWord(const String& misspelledWord)
> {
>     [[NSSpellChecker sharedSpellChecker] updateSpellingPanelWithMisspelledWord:misspelledWord];
>@@ -940,6 +916,11 @@ void WebEditorClient::setInputMethodStat
> {
> }
> 
>+AlternativeTextClient* WebEditorClient::alternativeTextClient()
>+{
>+    return m_alternativeTextClient.get();
>+}
>+
> #ifndef BUILDING_ON_LEOPARD
> @interface WebEditorSpellCheckResponder : NSObject
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 82970: 135722 | 135730 | 135760 | 135767 | 135776 | 135816