Changeset 57981 in webkit


Ignore:
Timestamp:
Apr 21, 2010 7:43:08 AM (14 years ago)
Author:
tkent@chromium.org
Message:

2010-04-21 Kent Tamura <tkent@chromium.org>

Reviewed by Shinichiro Hamaji.

[DRT/Chromium] Import MockSpellCheck from Chromium
https://bugs.webkit.org/show_bug.cgi?id=37910

Import webkit/tools/test_shell/mock_spellcheck.{cc,h} rev.37241 of Chromium.

  • DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Add ICU explicitly because WTFString.h includes ICU headers. Add MockSpellCheck.{cpp,h}.
  • DumpRenderTree/chromium/MockSpellCheck.cpp: Added.
  • DumpRenderTree/chromium/MockSpellCheck.h: Added.
  • DumpRenderTree/chromium/WebViewHost.cpp: (WebViewHost::spellCheck):
  • DumpRenderTree/chromium/WebViewHost.h:
  • DumpRenderTree/chromium/config.h: Define JS_EXPORTDATA, which is used by wtf/text/AtomicString.h included by wtf/text/WTFString.h.
Location:
trunk/WebKitTools
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r57977 r57981  
     12010-04-21  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Shinichiro Hamaji.
     4
     5        [DRT/Chromium] Import MockSpellCheck from Chromium
     6        https://bugs.webkit.org/show_bug.cgi?id=37910
     7
     8        Import webkit/tools/test_shell/mock_spellcheck.{cc,h} rev.37241 of Chromium.
     9
     10        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
     11          Add ICU explicitly because WTFString.h includes ICU headers.
     12          Add MockSpellCheck.{cpp,h}.
     13        * DumpRenderTree/chromium/MockSpellCheck.cpp: Added.
     14        * DumpRenderTree/chromium/MockSpellCheck.h: Added.
     15        * DumpRenderTree/chromium/WebViewHost.cpp:
     16        (WebViewHost::spellCheck):
     17        * DumpRenderTree/chromium/WebViewHost.h:
     18        * DumpRenderTree/chromium/config.h: Define JS_EXPORTDATA, which is used
     19          by wtf/text/AtomicString.h included by wtf/text/WTFString.h.
     20
    1212010-04-21  Adam Barth  <abarth@webkit.org>
    222
  • trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

    r57947 r57981  
    7777                '<(webkit_api_dir)/WebKit.gyp:webkit',
    7878                '<(webkit_top)/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
     79                '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
    7980                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
    8081                '<(chromium_src_dir)/skia/skia.gyp:skia',
     
    107108                '../chromium/LayoutTestController.cpp',
    108109                '../chromium/LayoutTestController.h',
     110                '../chromium/MockSpellCheck.cpp',
     111                '../chromium/MockSpellCheck.h',
    109112                '../chromium/PlainTextController.cpp',
    110113                '../chromium/PlainTextController.h',
  • trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp

    r57876 r57981  
    429429void WebViewHost::spellCheck(const WebString& text, int& misspelledOffset, int& misspelledLength)
    430430{
     431    // Check the spelling of the given text.
    431432#if OS(MAC_OS_X)
    432     // FIXME: Port mock_spellck.{cc,h}
     433    // FIXME: rebaseline layout-test results of Windows and Linux so we
     434    // can enable this mock spellchecker on them.
     435    m_spellcheck.spellCheckWord(text, &misspelledOffset, &misspelledLength);
    433436#endif
    434437}
  • trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.h

    r57648 r57981  
    3232#define WebViewHost_h
    3333
     34#include "MockSpellCheck.h"
    3435#include "TestNavigationController.h"
    3536#include "public/WebCursorInfo.h"
     
    257258    std::string m_editCommandValue;
    258259
     260    // The mock spellchecker used in spellCheck().
     261    MockSpellCheck m_spellcheck;
     262
    259263    // Painting.
    260264    OwnPtr<skia::PlatformCanvas> m_canvas;
  • trunk/WebKitTools/DumpRenderTree/chromium/config.h

    r56963 r57981  
    4545#include <wtf/Platform.h>
    4646
     47// JS_EXPORTDATA is needed to inlucde wtf/WTFString.h.
     48#if OS(WINDOWS) && !COMPILER(GCC)
     49#define JS_EXPORTDATA __declspec(dllimport)
     50#else
     51#define JS_EXPORTDATA
     52#endif
     53
    4754#endif // config_h
Note: See TracChangeset for help on using the changeset viewer.