Changeset 144524 in webkit


Ignore:
Timestamp:
Mar 1, 2013 9:06:30 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Source/WebCore: Moved markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

TestRunner framework is an old way of testing webkit, it would be
better to incorporate the testing frame directly into the WebCore itself
as to make it more compatible with WK2.

  • testing/Internals.cpp:

(WebCore::Internals::markerTextForListItem):
(WebCore):

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit/efl: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

  • WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
  • WebCoreSupport/DumpRenderTreeSupportEfl.h:

Source/WebKit/gtk: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

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

(DumpRenderTreeSupportGtk):

Source/WebKit/mac: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

  • DOM/WebDOMOperations.mm:
  • DOM/WebDOMOperationsPrivate.h:

Source/WebKit/qt: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

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

Tools: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

  • DumpRenderTree/TestRunner.cpp:

(TestRunner::staticFunctions):

  • DumpRenderTree/TestRunner.h:

(TestRunner):

  • DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
  • DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:

(WebTestRunner::TestRunner::TestRunner):

  • DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

  • DumpRenderTree/efl/TestRunnerEfl.cpp:
  • DumpRenderTree/gtk/TestRunnerGtk.cpp:
  • DumpRenderTree/mac/TestRunnerMac.mm:
  • DumpRenderTree/qt/TestRunnerQt.cpp:
  • DumpRenderTree/qt/TestRunnerQt.h:

(TestRunnerQt):

  • DumpRenderTree/win/TestRunnerWin.cpp:
  • DumpRenderTree/wx/TestRunnerWx.cpp:
  • WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
  • WebKitTestRunner/InjectedBundle/TestRunner.cpp:
  • WebKitTestRunner/InjectedBundle/TestRunner.h:

(TestRunner):

LayoutTests: Move markerTextForListItem from TestRunner to Internals
​https://bugs.webkit.org/show_bug.cgi?id=110939

Patch by Jason Anderssen <​janderssen@gmail.com> on 2013-03-01
Reviewed by Benjamin Poulain.

  • fast/lists/resources/dump-list.js:

(dumpListItemAsHTML):
(testListItemMarkerEqualsListItemText):

  • fast/lists/w3-css3-list-styles-numeric.html:
Location:
trunk
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r144519 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * fast/lists/resources/dump-list.js:
     9        (dumpListItemAsHTML):
     10        (testListItemMarkerEqualsListItemText):
     11        * fast/lists/w3-css3-list-styles-numeric.html:
     12
    1132013-03-01  Terry Anderson  <tdanderson@chromium.org>
    214

  • trunk/LayoutTests/fast/lists/resources/dump-list.js

    r122687 r144524  
    3636function dumpListItemAsHTML(listItemElement, depth)
    3737{
    38     var marker = testRunner.markerTextForListItem(listItemElement);
     38    var marker = internals.markerTextForListItem(listItemElement);
    3939    return marker ? indent(depth) + ' ' + marker + ' ' + listItemElement.innerText.trim() + '<br/>' : '';
    4040}
    … …  
    4242function testListItemMarkerEqualsListItemText(listItemElement, depth)
    4343{
    44     return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
     44    return testListItemMarkerEquals(internals.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
    4545}
    4646

  • trunk/LayoutTests/fast/lists/w3-css3-list-styles-numeric.html

    r122687 r144524  
    6565            var isNegativeNumber = listItemElement.parentNode.className && listItemElement.parentNode.className.split(" ").indexOf("negative-number") > -1;
    6666            var expectedMarkerText = (isNegativeNumber ? "-" : "") + listItemElement.innerText;
    67             return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), expectedMarkerText);
     67            return testListItemMarkerEquals(internals.markerTextForListItem(listItemElement), expectedMarkerText);
    6868        }
    6969

  • trunk/Source/WebCore/ChangeLog

    r144522 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Moved markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        TestRunner framework is an old way of testing webkit, it would be
     9        better to incorporate the testing frame directly into the WebCore itself
     10        as to make it more compatible with WK2.
     11
     12        * testing/Internals.cpp:
     13        (WebCore::Internals::markerTextForListItem):
     14        (WebCore):
     15        * testing/Internals.h:
     16        * testing/Internals.idl:
     17
    1182013-03-01  Elliott Sprehn  <esprehn@gmail.com>
    219

  • trunk/Source/WebCore/testing/Internals.cpp

    r143837 r144524  
    20112011#endif
    20122012
    2013 }
     2013String Internals::markerTextForListItem(Element* element, ExceptionCode& ec)
     2014{
     2015    if (!element) {
     2016        ec = INVALID_ACCESS_ERR;
     2017        return String();
     2018    }
     2019    return WebCore::markerTextForListItem(element);
     2020}
     2021
     2022}

  • trunk/Source/WebCore/testing/Internals.h

    r143837 r144524  
    283283    String getCurrentCursorInfo(Document*, ExceptionCode&);
    284284
     285    String markerTextForListItem(Element*, ExceptionCode&);
     286
    285287#if ENABLE(ENCRYPTED_MEDIA_V2)
    286288    void initializeMockCDM();

  • trunk/Source/WebCore/testing/Internals.idl

    r143837 r144524  
    247247    DOMString getCurrentCursorInfo(in Document document) raises (DOMException);
    248248
     249    DOMString markerTextForListItem(in Element element) raises (DOMException);
     250
    249251    SerializedScriptValue deserializeBuffer(in ArrayBuffer buffer);
    250252    ArrayBuffer serializeObject(in SerializedScriptValue obj);

  • trunk/Source/WebKit/efl/ChangeLog

    r144446 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
     9        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
     10
    1112013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

    r144446 r144524  
    542542}
    543543
    544 String DumpRenderTreeSupportEfl::markerTextForListItem(JSContextRef context, JSValueRef nodeObject)
    545 {
    546     JSC::ExecState* exec = toJS(context);
    547     WebCore::Element* element = WebCore::toElement(toJS(exec, nodeObject));
    548     if (!element)
    549         return String();
    550 
    551     return WebCore::markerTextForListItem(element);
    552 }
    553 
    554544void DumpRenderTreeSupportEfl::setInteractiveFormValidationEnabled(Evas_Object* ewkView, bool enabled)
    555545{

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h

    r143837 r144524  
    108108
    109109    static void deliverAllMutationsIfNecessary();
    110     static String markerTextForListItem(JSContextRef, JSValueRef nodeObject);
    111110    static void setInteractiveFormValidationEnabled(Evas_Object* ewkView, bool enabled);
    112111    static void setValidationMessageTimerMagnification(Evas_Object* ewkView, int value);

  • trunk/Source/WebKit/gtk/ChangeLog

    r144506 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     9        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     10        (DumpRenderTreeSupportGtk):
     11
    1122013-03-01  Martin Robinson  <mrobinson@igalia.com>
    213

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r143837 r144524  
    240240}
    241241
    242 CString DumpRenderTreeSupportGtk::markerTextForListItem(WebKitWebFrame* frame, JSContextRef context, JSValueRef nodeObject)
    243 {
    244     JSC::ExecState* exec = toJS(context);
    245     Element* element = toElement(toJS(exec, nodeObject));
    246     if (!element)
    247         return CString();
    248 
    249     return WebCore::markerTextForListItem(element).utf8();
    250 }
    251 
    252242void DumpRenderTreeSupportGtk::clearMainFrameName(WebKitWebFrame* frame)
    253243{

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r143837 r144524  
    6464    static void addUserStyleSheet(WebKitWebFrame*, const char* sourceCode, bool allFrames);
    6565    static guint getPendingUnloadEventCount(WebKitWebFrame*);
    66     static WTF::CString markerTextForListItem(WebKitWebFrame*, JSContextRef, JSValueRef nodeObject);
    6766    static void clearMainFrameName(WebKitWebFrame*);
    6867    static AtkObject* getFocusedAccessibleElement(WebKitWebFrame*);

  • trunk/Source/WebKit/mac/ChangeLog

    r144495 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * DOM/WebDOMOperations.mm:
     9        * DOM/WebDOMOperationsPrivate.h:
     10
    1112013-02-28  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm

    r144446 r144524  
    7373}
    7474
    75 - (NSString *)_markerTextForListItem
    76 {
    77     return WebCore::markerTextForListItem(core(self));
    78 }
    79 
    8075@end
    8176

  • trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h

    r108850 r144524  
    3232@interface DOMElement (WebDOMElementOperationsPrivate)
    3333+ (DOMElement *)_DOMElementFromJSContext:(JSContextRef)context value:(JSValueRef)value;
    34 - (NSString *)_markerTextForListItem;
    3534@end
    3635

  • trunk/Source/WebKit/qt/ChangeLog

    r144446 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     9        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     10
    1112013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r143837 r144524  
    376376}
    377377
    378 QString DumpRenderTreeSupportQt::markerTextForListItem(const QWebElement& listItem)
    379 {
    380     return WebCore::markerTextForListItem(listItem.m_element);
    381 }
    382 
    383378static QString convertToPropertyName(const QString& name)
    384379{

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r143837 r144524  
    140140    static int numberOfPendingGeolocationPermissionRequests(QWebPageAdapter*);
    141141
    142     static QString markerTextForListItem(const QWebElement& listItem);
    143142    static QVariantMap computedStyleIncludingVisitedInfo(const QWebElement&);
    144143

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r144446 r144524  
    133133}
    134134
    135 WKStringRef WKBundleFrameCopyMarkerText(WKBundleFrameRef frameRef, JSObjectRef element)
    136 {
    137     return toCopiedAPI(toImpl(frameRef)->markerText(element));
    138 }
    139 
    140135WKStringRef WKBundleFrameCopyInnerText(WKBundleFrameRef frameRef)
    141136{

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h

    r142171 r144524  
    4040WK_EXPORT WKStringRef WKBundleFrameCopyInnerText(WKBundleFrameRef frame);
    4141WK_EXPORT WKStringRef WKBundleFrameCopyCounterValue(WKBundleFrameRef frame, JSObjectRef element);
    42 WK_EXPORT WKStringRef WKBundleFrameCopyMarkerText(WKBundleFrameRef frame, JSObjectRef element);
    4342WK_EXPORT JSValueRef WKBundleFrameGetComputedStyleIncludingVisitedInfo(WKBundleFrameRef frame, JSObjectRef element);
    4443WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r143295 r144524  
    647647}
    648648
    649 String WebFrame::markerText(JSObjectRef element)
    650 {
    651     if (!toJS(element)->inherits(&JSElement::s_info))
    652         return String();
    653 
    654     return markerTextForListItem(static_cast<JSElement*>(toJS(element))->impl());
    655 }
    656 
    657649String WebFrame::provisionalURL() const
    658650{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

    r142171 r144524  
    114114
    115115    static String counterValue(JSObjectRef element);
    116     static String markerText(JSObjectRef element);
    117116
    118117    String layerTreeAsText() const;

  • trunk/Source/autotools/symbols.filter

    r143837 r144524  
    281281_ZN7WebCore9PageGroup18captionPreferencesEv;
    282282_ZN7WebCore4Page9initGroupEv;
     283_ZN7WebCore21markerTextForListItemEPNS_7ElementE;
    283284
    284285local:

  • trunk/Tools/ChangeLog

    r144510 r144524  
     12013-03-01  Jason Anderssen  <janderssen@gmail.com>
     2
     3        Move markerTextForListItem from TestRunner to Internals
     4        https://bugs.webkit.org/show_bug.cgi?id=110939
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * DumpRenderTree/TestRunner.cpp:
     9        (TestRunner::staticFunctions):
     10        * DumpRenderTree/TestRunner.h:
     11        (TestRunner):
     12        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
     13        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     14        (WebTestRunner::TestRunner::TestRunner):
     15        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
     16        (TestRunner):
     17        * DumpRenderTree/efl/TestRunnerEfl.cpp:
     18        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
     19        * DumpRenderTree/mac/TestRunnerMac.mm:
     20        * DumpRenderTree/qt/TestRunnerQt.cpp:
     21        * DumpRenderTree/qt/TestRunnerQt.h:
     22        (TestRunnerQt):
     23        * DumpRenderTree/win/TestRunnerWin.cpp:
     24        * DumpRenderTree/wx/TestRunnerWx.cpp:
     25        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     26        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     27        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     28        (TestRunner):
     29
    1302013-03-01  Ryosuke Niwa  <rniwa@webkit.org>
    231

  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r143837 r144524  
    17661766}
    17671767
    1768 static JSValueRef markerTextForListItemCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1769 {
    1770     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    1771     if (argumentCount < 1)
    1772         return JSValueMakeUndefined(context);
    1773     return JSValueMakeString(context, controller->markerTextForListItem(context, arguments[0]).get());
    1774 }
    1775 
    17761768static JSValueRef authenticateSessionCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    17771769{
    … …  
    21172109        { "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21182110        { "numberOfPendingGeolocationPermissionRequests", numberOfPendingGeolocationPermissionRequestsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2119         { "markerTextForListItem", markerTextForListItemCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21202111        { "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    21212112        { "overridePreference", overridePreferenceCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/TestRunner.h

    r143837 r144524  
    327327    void authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password);
    328328
    329     JSRetainPtr<JSStringRef> markerTextForListItem(JSContextRef, JSValueRef nodeObject) const;
    330 
    331329    JSValueRef originsWithLocalStorage(JSContextRef);
    332330    void deleteAllLocalStorage();

  • trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

    r144275 r144524  
    511511}
    512512
    513 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    514 {
    515     WebCore::Element* element = toElement(toJS(toJS(context), nodeObject));
    516     if (!element)
    517         return 0;
    518 
    519     JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithUTF8CString(WebCore::markerTextForListItem(element).utf8().data()));
    520     return markerText;
    521 }
    522 
    523513void TestRunner::setPluginsEnabled(bool flag)
    524514{

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

    r144248 r144524  
    197197    bindMethod("addUserStyleSheet", &TestRunner::addUserStyleSheet);
    198198    bindMethod("startSpeechInput", &TestRunner::startSpeechInput);
    199     bindMethod("markerTextForListItem", &TestRunner::markerTextForListItem);
    200199    bindMethod("findString", &TestRunner::findString);
    201200    bindMethod("setValueForUser", &TestRunner::setValueForUser);
    … …  
    13451344
    13461345    input->startSpeechInput();
    1347 }
    1348 
    1349 void TestRunner::markerTextForListItem(const CppArgumentList& args, CppVariant* result)
    1350 {
    1351     WebElement element;
    1352     if (!WebBindings::getElement(args[0].value.objectValue, &element))
    1353         result->setNull();
    1354     else
    1355         result->set(element.document().frame()->markerTextForListItem(element).utf8());
    13561346}
    13571347

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

    r144248 r144524  
    240240    void startSpeechInput(const CppArgumentList&, CppVariant*);
    241241
    242     void markerTextForListItem(const CppArgumentList&, CppVariant*);
    243242    void findString(const CppArgumentList&, CppVariant*);
    244243

  • trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

    r143837 r144524  
    762762}
    763763
    764 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    765 {
    766     String markerTextChar = DumpRenderTreeSupportEfl::markerTextForListItem(context, nodeObject);
    767     if (markerTextChar.isEmpty())
    768         return 0;
    769 
    770     JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithUTF8CString(markerTextChar.utf8().data()));
    771     return markerText;
    772 }
    773 
    774764void TestRunner::authenticateSession(JSStringRef, JSStringRef, JSStringRef)
    775765{

  • trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp

    r143837 r144524  
    865865}
    866866
    867 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    868 {
    869     CString markerTextGChar = DumpRenderTreeSupportGtk::markerTextForListItem(mainFrame, context, nodeObject);
    870     if (markerTextGChar.isNull())
    871         return 0;
    872 
    873     JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithUTF8CString(markerTextGChar.data()));
    874     return markerText;
    875 }
    876 
    877867void TestRunner::authenticateSession(JSStringRef, JSStringRef, JSStringRef)
    878868{

  • trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm

    r143837 r144524  
    279279}
    280280
    281 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    282 {
    283     DOMElement *element = [DOMElement _DOMElementFromJSContext:context value:nodeObject];
    284     if (!element)
    285         return JSRetainPtr<JSStringRef>();
    286 
    287     JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithCFString((CFStringRef)[element _markerTextForListItem]));
    288     return markerText;
    289 }
    290 
    291281int TestRunner::numberOfPendingGeolocationPermissionRequests()
    292282{

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp

    r143837 r144524  
    746746}
    747747
    748 QString TestRunnerQt::markerTextForListItem(const QWebElement& listItem)
    749 {
    750     return DumpRenderTreeSupportQt::markerTextForListItem(listItem);
    751 }
    752 
    753748QVariantMap TestRunnerQt::computedStyleIncludingVisitedInfo(const QWebElement& element) const
    754749{

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h

    r143837 r144524  
    248248    void setScrollbarPolicy(const QString& orientation, const QString& policy);
    249249
    250     QString markerTextForListItem(const QWebElement& listItem);
    251250    QVariantMap computedStyleIncludingVisitedInfo(const QWebElement&) const;
    252251

  • trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

    r143837 r144524  
    167167}
    168168
    169 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    170 {
    171     COMPtr<IWebView> webView;
    172     if (FAILED(frame->webView(&webView)))
    173         return 0;
    174 
    175     COMPtr<IWebViewPrivate> webViewPrivate(Query, webView);
    176     if (!webViewPrivate)
    177         return 0;
    178 
    179     COMPtr<IDOMElement> element;
    180     if (FAILED(webViewPrivate->elementFromJS(context, nodeObject, &element)))
    181         return 0;
    182 
    183     COMPtr<IDOMElementPrivate> elementPrivate(Query, element);
    184     if (!elementPrivate)
    185         return 0;
    186 
    187     BSTR textBSTR = 0;
    188     if (FAILED(elementPrivate->markerTextForListItem(&textBSTR)))
    189         return 0;
    190 
    191     JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithBSTR(textBSTR));
    192     SysFreeString(textBSTR);
    193     return markerText;
    194 }
    195 
    196169void TestRunner::waitForPolicyDelegate()
    197170{

  • trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp

    r143837 r144524  
    459459}
    460460
    461 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    462 {
    463     return 0;
    464 }
    465 
    466461JSValueRef TestRunner::computedStyleIncludingVisitedInfo(JSContextRef, JSValueRef)
    467462{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r142509 r144524  
    7878    void execCommand(in DOMString name, in DOMString argument);
    7979    boolean isCommandEnabled(in DOMString name);
    80     DOMString markerTextForListItem(in object element);
    8180    unsigned long windowCount();
    8281

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r142509 r144524  
    204204}
    205205
    206 JSRetainPtr<JSStringRef> TestRunner::markerTextForListItem(JSValueRef element)
    207 {
    208     WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
    209     JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
    210     if (!element || !JSValueIsObject(context, element))
    211         return 0;
    212     WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyMarkerText(mainFrame, const_cast<JSObjectRef>(element)));
    213     if (WKStringIsEmpty(text.get()))
    214         return 0;
    215     return toJS(text);
    216 }
    217 
    218206void TestRunner::execCommand(JSStringRef name, JSStringRef argument)
    219207{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r142509 r144524  
    122122    void execCommand(JSStringRef name, JSStringRef argument);
    123123    bool isCommandEnabled(JSStringRef name);
    124     JSRetainPtr<JSStringRef> markerTextForListItem(JSValueRef element);
    125124    unsigned windowCount();
    126125
Note: See TracChangeset for help on using the changeset viewer.