Changeset 141387 in webkit

Timestamp:

Jan 31, 2013 12:38:25 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r141110.
​http://trac.webkit.org/changeset/141110
​https://bugs.webkit.org/show_bug.cgi?id=108349

This patch broke WK2-EFL unit tests (Requested by grzegorz on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-31

Source/WebCore:

• platform/text/TextChecking.h:

(WebCore):

Source/WebKit/efl:

• WebCoreSupport/EditorClientEfl.h:

Source/WebKit2:

• UIProcess/efl/TextCheckerEfl.cpp:
• WebProcess/WebCoreSupport/WebEditorClient.h:
• WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp:

LayoutTests:

• platform/efl-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/text/TextChecking.h (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141110.
+        http://trac.webkit.org/changeset/141110
+        https://bugs.webkit.org/show_bug.cgi?id=108349
+
+        This patch broke WK2-EFL unit tests (Requested by grzegorz on
+        #webkit).
+
+        * platform/efl-wk2/TestExpectations:
+
 2013-01-31  Kentaro Hara  <haraken@chromium.org>
 

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -317 +317 @@
 Bug(EFL) fast/events/touch/basic-single-touch-events.html [ Failure ]
 
-# On Linux, should be able to get spelling suggestions without selecting the misspelled word when unified text checker is enabled.
-webkit.org/b/107684 editing/spelling/context-menu-suggestions.html [ Failure ]
-
 # Needs grammar checking
 Bug(EFL) editing/spelling/grammar-edit-word.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141110.
+        http://trac.webkit.org/changeset/141110
+        https://bugs.webkit.org/show_bug.cgi?id=108349
+
+        This patch broke WK2-EFL unit tests (Requested by grzegorz on
+        #webkit).
+
+        * platform/text/TextChecking.h:
+        (WebCore):
+
 2013-01-31  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/text/TextChecking.h

@@ -40 +40 @@
 #define WTF_USE_GRAMMAR_CHECKING 1
 
-#if (PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)) || PLATFORM(BLACKBERRY) || PLATFORM(EFL)
+#if (PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)) || PLATFORM(BLACKBERRY)
 #define WTF_USE_UNIFIED_TEXT_CHECKING 1
 #endif

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141110.
+        http://trac.webkit.org/changeset/141110
+        https://bugs.webkit.org/show_bug.cgi?id=108349
+
+        This patch broke WK2-EFL unit tests (Requested by grzegorz on
+        #webkit).
+
+        * WebCoreSupport/EditorClientEfl.h:
+
 2013-01-30  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h

@@ -150 +150 @@
     virtual void setInputMethodState(bool enabled);
     virtual void requestCheckingOfString(WTF::PassRefPtr<WebCore::TextCheckingRequest>) { }
-#if USE(UNIFIED_TEXT_CHECKING)
-    virtual void checkTextOfParagraph(const UChar*, int, TextCheckingTypeMask, Vector<TextCheckingResult>&) { }
-#endif
     virtual TextCheckerClient* textChecker() { return this; }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141110.
+        http://trac.webkit.org/changeset/141110
+        https://bugs.webkit.org/show_bug.cgi?id=108349
+
+        This patch broke WK2-EFL unit tests (Requested by grzegorz on
+        #webkit).
+
+        * UIProcess/efl/TextCheckerEfl.cpp:
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+        * WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp:
+
 2013-01-31  Jae Hyun Park  <jae.park@company100.net>
 

trunk/Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp

@@ -125 +125 @@
 }
 
-#if USE(UNIFIED_TEXT_CHECKING)
-Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(int64_t spellDocumentTag, const UChar* text, int length, uint64_t checkingTypes)
-{
-    Vector<TextCheckingResult> paragraphCheckingResult;
-#if ENABLE(SPELLCHECK)
-    if (checkingTypes & TextCheckingTypeSpelling) {
-        int offset = 0;
-        while (offset < length) {
-            int32_t misspellingLocation = -1;
-            int32_t misspellingLength = 0;
-            checkSpellingOfString(spellDocumentTag, text + offset, length - offset, misspellingLocation, misspellingLength);
-            if (!misspellingLength)
-                break;
-
-            TextCheckingResult misspellingResult;
-            misspellingResult.type = TextCheckingTypeSpelling;
-            misspellingResult.location = offset + misspellingLocation;
-            misspellingResult.length = misspellingLength;
-            paragraphCheckingResult.append(misspellingResult);
-
-            offset += misspellingLocation + misspellingLength;
-        }
-    }
-#else
-    UNUSED_PARAM(spellDocumentTag);
-    UNUSED_PARAM(text);
-    UNUSED_PARAM(length);
-    UNUSED_PARAM(checkingTypes);
-#endif
-    return paragraphCheckingResult;
-}
-#endif
-
 void TextChecker::checkSpellingOfString(int64_t spellDocumentTag, const UChar* text, uint32_t length, int32_t& misspellingLocation, int32_t& misspellingLength)
 {

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -138 +138 @@
     virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) OVERRIDE;
     virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE;
-#if PLATFORM(MAC) || PLATFORM(EFL)
+#if PLATFORM(MAC)
     virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results) OVERRIDE;
 #endif

trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp

@@ -61 +61 @@
 }
 
-void WebEditorClient::checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<TextCheckingResult>& results)
-{
-    m_page->sendSync(Messages::WebPageProxy::CheckTextOfParagraph(String(text, length), checkingTypes), Messages::WebPageProxy::CheckTextOfParagraph::Reply(results));
 }
-
-}