Changeset 110032 in webkit


Ignore:
Timestamp:
Mar 7, 2012 12:43:57 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[DRT] Remove PlainTextController implementations.
https://bugs.webkit.org/show_bug.cgi?id=79959

Patch by Kangil Han <kangil.han@samsung.com> on 2012-03-07
Reviewed by Hajime Morita.

PlainTextController usages in existing tests have been
replaced by internals API by bug 78570.
So this patch will remove PlainTextController implementations
to avoid further usage in new tests.

Source/WebKit/gtk:

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
  • WebCoreSupport/DumpRenderTreeSupportGtk.h:

(DumpRenderTreeSupportGtk):

Source/WebKit/qt:

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

Tools:

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
  • DumpRenderTree/chromium/PlainTextController.cpp: Removed.
  • DumpRenderTree/chromium/PlainTextController.h: Removed.
  • DumpRenderTree/chromium/TestShell.cpp:

(TestShell::TestShell):
(TestShell::bindJSObjectsToWindow):

  • DumpRenderTree/chromium/TestShell.h:

(TestShell):

  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(webViewWindowObjectCleared):

  • DumpRenderTree/gtk/PlainTextController.cpp: Removed.
  • DumpRenderTree/gtk/PlainTextController.h: Removed.
  • DumpRenderTree/mac/FrameLoadDelegate.mm:

(-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]):

  • DumpRenderTree/mac/PlainTextController.h: Removed.
  • DumpRenderTree/mac/PlainTextController.mm: Removed.
  • DumpRenderTree/qt/DumpRenderTree.pro:
  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::DumpRenderTree::DumpRenderTree):
(WebCore::DumpRenderTree::initJSObjects):

  • DumpRenderTree/qt/DumpRenderTreeQt.h:

(DumpRenderTree):

  • DumpRenderTree/qt/PlainTextControllerQt.cpp: Removed.
  • DumpRenderTree/qt/PlainTextControllerQt.h: Removed.
  • GNUmakefile.am:

LayoutTests:

  • fast/dom/Window/script-tests/window-property-descriptors.js:
  • fast/dom/Window/window-properties.html:
  • fast/dom/script-tests/prototype-inheritance-2.js:
  • fast/dom/script-tests/prototype-inheritance.js:
Location:
trunk
Files:
8 deleted
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r110031 r110032  
     12012-03-07  Kangil Han  <kangil.han@samsung.com>
     2
     3        [DRT] Remove PlainTextController implementations.
     4        https://bugs.webkit.org/show_bug.cgi?id=79959
     5
     6        Reviewed by Hajime Morita.
     7
     8        PlainTextController usages in existing tests have been
     9        replaced by internals API by bug 78570.
     10        So this patch will remove PlainTextController implementations
     11        to avoid further usage in new tests.
     12
     13        * fast/dom/Window/script-tests/window-property-descriptors.js:
     14        * fast/dom/Window/window-properties.html:
     15        * fast/dom/script-tests/prototype-inheritance-2.js:
     16        * fast/dom/script-tests/prototype-inheritance.js:
     17
    1182012-03-07  Fumitoshi Ukai  <ukai@chromium.org>
    219
  • trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js

    r105217 r110032  
    2222    "objCPlugin" : 1,
    2323    "objCPluginFunction" : 1,
    24     "plainText" : 1,
    2524    "textInputController" : 1,
    2625
  • trunk/LayoutTests/fast/dom/Window/window-properties.html

    r105217 r110032  
    6363    "window.objCPlugin" : 1,
    6464    "window.objCPluginFunction" : 1,
    65     "window.plainText" : 1,
    6665    "window.textInputController" : 1,
    6766
  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js

    r108729 r110032  
    2121    "objCPlugin",
    2222    "objCPluginFunction",
    23     "plainText",
    2423    "textInputController",
    2524
  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js

    r104126 r110032  
    1212    "objCController", "textInputController", "navigationController",
    1313    "eventSender", "objCPlugin", "objCPluginFunction",
    14     "appleScriptController", "plainText", "accessibilityController",
     14    "appleScriptController", "accessibilityController",
    1515    "gamepadController",
    1616    "internals",
  • trunk/Source/WebKit/gtk/ChangeLog

    r110002 r110032  
     12012-03-07  Kangil Han  <kangil.han@samsung.com>
     2
     3        [DRT] Remove PlainTextController implementations.
     4        https://bugs.webkit.org/show_bug.cgi?id=79959
     5
     6        Reviewed by Hajime Morita.
     7
     8        PlainTextController usages in existing tests have been
     9        replaced by internals API by bug 78570.
     10        So this patch will remove PlainTextController implementations
     11        to avoid further usage in new tests.
     12
     13        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     14        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     15        (DumpRenderTreeSupportGtk):
     16
    1172012-03-06  Martin Robinson  <mrobinson@igalia.com>
    218
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r109753 r110032  
    4747#include "JSLock.h"
    4848#include "JSNodeList.h"
    49 #include "JSRange.h"
    5049#include "JSValue.h"
    5150#include "NodeList.h"
     
    6160#include "TextIterator.h"
    6261#include "WebKitAccessibleWrapperAtk.h"
    63 #include "WebKitDOMRangePrivate.h"
    6462#include "WebKitMutationObserver.h"
    6563#include "WorkerThread.h"
     
    130128    RefPtr<NodeList> nodes = document->nodesFromRect(x, y, top, right, bottom, left, ignoreClipping);
    131129    return toRef(exec, toJS(exec, jsDocument->globalObject(), nodes.get()));
    132 }
    133 
    134 WebKitDOMRange* DumpRenderTreeSupportGtk::jsValueToDOMRange(JSContextRef context, JSValueRef value)
    135 {
    136     if (!value)
    137         return 0;
    138 
    139     JSLock lock(SilenceAssertionsOnly);
    140     ExecState* exec = toJS(context);
    141 
    142     Range* range = toRange(toJS(exec, value));
    143     if (!range)
    144         return 0;
    145     return kit(range);
    146130}
    147131
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r109753 r110032  
    2424#include <glib.h>
    2525#include <webkit/webkitdefines.h>
    26 #include <webkit/webkitdomdefines.h>
    2726#include <wtf/text/CString.h>
    2827
     
    5958
    6059    static void clearOpener(WebKitWebFrame*);
    61 
    62     static WebKitDOMRange* jsValueToDOMRange(JSContextRef, JSValueRef);
    6360
    6461    // FIXME: Move these to webkitwebframe.h once their API has been discussed.
  • trunk/Source/WebKit/qt/ChangeLog

    r109915 r110032  
     12012-03-07  Kangil Han  <kangil.han@samsung.com>
     2
     3        [DRT] Remove PlainTextController implementations.
     4        https://bugs.webkit.org/show_bug.cgi?id=79959
     5
     6        Reviewed by Hajime Morita.
     7
     8        PlainTextController usages in existing tests have been
     9        replaced by internals API by bug 78570.
     10        So this patch will remove PlainTextController implementations
     11        to avoid further usage in new tests.
     12
     13        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     14        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     15
    1162012-03-06  Philippe Normand  <pnormand@igalia.com>
    217
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r107811 r110032  
    993993}
    994994
    995 QString DumpRenderTreeSupportQt::plainText(const QVariant& range)
    996 {
    997     QMap<QString, QVariant> map = range.toMap();
    998     QVariant startContainer  = map.value(QLatin1String("startContainer"));
    999     map = startContainer.toMap();
    1000 
    1001     return map.value(QLatin1String("innerText")).toString();
    1002 }
    1003 
    1004995QVariantList DumpRenderTreeSupportQt::nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping)
    1005996{
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r107682 r110032  
    168168    static QString markerTextForListItem(const QWebElement& listItem);
    169169    static QVariantMap computedStyleIncludingVisitedInfo(const QWebElement& element);
    170     static QString plainText(const QVariant& rng);
    171170
    172171    static void dumpFrameLoader(bool b);
  • trunk/Tools/ChangeLog

    r110028 r110032  
     12012-03-07  Kangil Han  <kangil.han@samsung.com>
     2
     3        [DRT] Remove PlainTextController implementations.
     4        https://bugs.webkit.org/show_bug.cgi?id=79959
     5
     6        Reviewed by Hajime Morita.
     7
     8        PlainTextController usages in existing tests have been
     9        replaced by internals API by bug 78570.
     10        So this patch will remove PlainTextController implementations
     11        to avoid further usage in new tests.
     12
     13        * DumpRenderTree/DumpRenderTree.gypi:
     14        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     15        * DumpRenderTree/chromium/PlainTextController.cpp: Removed.
     16        * DumpRenderTree/chromium/PlainTextController.h: Removed.
     17        * DumpRenderTree/chromium/TestShell.cpp:
     18        (TestShell::TestShell):
     19        (TestShell::bindJSObjectsToWindow):
     20        * DumpRenderTree/chromium/TestShell.h:
     21        (TestShell):
     22        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     23        (webViewWindowObjectCleared):
     24        * DumpRenderTree/gtk/PlainTextController.cpp: Removed.
     25        * DumpRenderTree/gtk/PlainTextController.h: Removed.
     26        * DumpRenderTree/mac/FrameLoadDelegate.mm:
     27        (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]):
     28        * DumpRenderTree/mac/PlainTextController.h: Removed.
     29        * DumpRenderTree/mac/PlainTextController.mm: Removed.
     30        * DumpRenderTree/qt/DumpRenderTree.pro:
     31        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     32        (WebCore::DumpRenderTree::DumpRenderTree):
     33        (WebCore::DumpRenderTree::initJSObjects):
     34        * DumpRenderTree/qt/DumpRenderTreeQt.h:
     35        (DumpRenderTree):
     36        * DumpRenderTree/qt/PlainTextControllerQt.cpp: Removed.
     37        * DumpRenderTree/qt/PlainTextControllerQt.h: Removed.
     38        * GNUmakefile.am:
     39
    1402012-03-06  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
    241
  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r106353 r110032  
    2727            'chromium/NotificationPresenter.h',
    2828            'chromium/NotificationPresenter.cpp',
    29             'chromium/PlainTextController.cpp',
    30             'chromium/PlainTextController.h',
    3129            'chromium/Task.h',
    3230            'chromium/Task.cpp',
  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r105325 r110032  
    8181                80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */; };
    8282                8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; };
    83                 933BF5AB0F93FA5C000F0441 /* PlainTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 933BF5A90F93FA5C000F0441 /* PlainTextController.h */; };
    84                 933BF5AC0F93FA5C000F0441 /* PlainTextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */; };
    8583                9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; };
    8684                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
     
    265263                8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
    266264                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    267                 933BF5A90F93FA5C000F0441 /* PlainTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlainTextController.h; path = mac/PlainTextController.h; sourceTree = "<group>"; };
    268                 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlainTextController.mm; path = mac/PlainTextController.mm; sourceTree = "<group>"; };
    269265                9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
    270266                A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DumpRenderTree.h; sourceTree = "<group>"; };
     
    470466                                BCA18B2F0C9B01B400114369 /* ObjCController.h */,
    471467                                BCA18B300C9B01B400114369 /* ObjCController.m */,
    472                                 933BF5A90F93FA5C000F0441 /* PlainTextController.h */,
    473                                 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */,
    474468                                BCA18B3A0C9B024900114369 /* TextInputController.h */,
    475469                                BCA18B480C9B02C400114369 /* TextInputController.m */,
     
    673667                                BCB284C70CFA83C4007E533E /* PixelDumpSupport.h in Headers */,
    674668                                BCB284D00CFA83CC007E533E /* PixelDumpSupportCG.h in Headers */,
    675                                 933BF5AB0F93FA5C000F0441 /* PlainTextController.h in Headers */,
    676669                                BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */,
    677670                                BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */,
     
    873866                                BCB284CD0CFA83C8007E533E /* PixelDumpSupportCG.cpp in Sources */,
    874867                                BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */,
    875                                 933BF5AC0F93FA5C000F0441 /* PlainTextController.mm in Sources */,
    876868                                BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */,
    877869                                BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */,
  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r109938 r110032  
    138138    m_layoutTestController = adoptPtr(new LayoutTestController(this));
    139139    m_eventSender = adoptPtr(new EventSender(this));
    140     m_plainTextController = adoptPtr(new PlainTextController());
    141140    m_textInputController = adoptPtr(new TextInputController(this));
    142141#if ENABLE(NOTIFICATIONS)
     
    699698    m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
    700699    m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
    701     m_plainTextController->bindToJavascript(frame, WebString::fromUTF8("plainText"));
    702700    m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
    703701}
  • trunk/Tools/DumpRenderTree/chromium/TestShell.h

    r108225 r110032  
    3737#include "LayoutTestController.h"
    3838#include "NotificationPresenter.h"
    39 #include "PlainTextController.h"
    4039#include "TestEventPrinter.h"
    4140#include "TextInputController.h"
     
    216215    OwnPtr<EventSender> m_eventSender;
    217216    OwnPtr<LayoutTestController> m_layoutTestController;
    218     OwnPtr<PlainTextController> m_plainTextController;
    219217    OwnPtr<TextInputController> m_textInputController;
    220218    OwnPtr<NotificationPresenter> m_notificationPresenter;
  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r109719 r110032  
    4040#include "LayoutTestController.h"
    4141#include "PixelDumpSupport.h"
    42 #include "PlainTextController.h"
    4342#include "SelfScrollingWebKitWebView.h"
    4443#include "TextInputController.h"
     
    836835
    837836    addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame)));
    838     addControllerToWindow(context, windowObject, "plainText", makePlainTextController(context));
    839837    addControllerToWindow(context, windowObject, "textInputController", makeTextInputController(context));
    840838    WebCoreTestSupport::injectInternalsObject(context);
  • trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm

    r99762 r110032  
    4141#import "ObjCPlugin.h"
    4242#import "ObjCPluginFunction.h"
    43 #import "PlainTextController.h"
    4443#import "TextInputController.h"
    4544#import "WebCoreTestSupport.h"
     
    299298    [pluginFunction release];
    300299
    301     [obj setValue:[PlainTextController sharedPlainTextController] forKey:@"plainText"];
    302 
    303300    TextInputController *tic = [[TextInputController alloc] initWithWebView:webView];
    304301    [obj setValue:tic forKey:@"textInputController"];
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r109909 r110032  
    3434    LayoutTestControllerQt.h \
    3535    GCControllerQt.h \
    36     PlainTextControllerQt.h \
    3736    QtInitializeTestFonts.h \
    3837    testplugin.h
     
    4443    EventSenderQt.cpp \
    4544    TextInputControllerQt.cpp \
    46     PlainTextControllerQt.cpp \
    4745    WorkQueueItemQt.cpp \
    4846    LayoutTestControllerQt.cpp \
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r107171 r110032  
    3838#include "LayoutTestControllerQt.h"
    3939#include "TextInputControllerQt.h"
    40 #include "PlainTextControllerQt.h"
    4140#include "QtInitializeTestFonts.h"
    4241#include "testplugin.h"
     
    441440    m_eventSender = new EventSender(m_page);
    442441    m_textInputController = new TextInputController(m_page);
    443     m_plainTextController = new PlainTextController(m_page);
    444442    m_gcController = new GCController(m_page);
    445443
     
    752750    frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
    753751    frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController);
    754     frame->addToJavaScriptWindowObject(QLatin1String("plainText"), m_plainTextController);
    755752    DumpRenderTreeSupportQt::injectInternalsObject(frame);
    756753}
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

    r107171 r110032  
    6161class TextInputController;
    6262class GCController;
    63 class PlainTextController;
    6463
    6564namespace WebCore {
     
    154153    TextInputController *m_textInputController;
    155154    GCController* m_gcController;
    156     PlainTextController* m_plainTextController;
    157155    NetworkAccessManager* m_networkAccessManager;
    158156
  • trunk/Tools/GNUmakefile.am

    r108985 r110032  
    136136        Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
    137137        Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \
    138         Tools/DumpRenderTree/gtk/PlainTextController.cpp \
    139         Tools/DumpRenderTree/gtk/PlainTextController.h \
    140138        Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp \
    141139        Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.h \
Note: See TracChangeset for help on using the changeset viewer.