Changeset 63710 in webkit


Ignore:
Timestamp:
Jul 19, 2010 8:01:17 PM (14 years ago)
Author:
dbates@webkit.org
Message:

2010-07-19 Daniel Bates <dbates@rim.com>

Reviewed by Adam Roben.

[Win] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37930

Implements support for markerTextForListItem in the Windows port.

  • DOMCoreClasses.cpp: (DOMElement::markerTextForListItem): Added.
  • DOMCoreClasses.h:
  • Interfaces/DOMPrivate.idl: Added declaration for markerTextForListItem().
  • Interfaces/IWebViewPrivate.idl: Added declaration for elementFromJS().
  • Interfaces/WebKit.idl: Touch it to force a rebuild (and for good luck :-)).
  • WebView.cpp: (WebView::elementFromJS): Added.
  • WebView.h:

2010-07-19 Daniel Bates <dbates@rim.com>

Reviewed by Adam Roben.

[Win] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37930

Remove skipped layout tests now that we have DRT support.

  • platform/win/Skipped:

2010-07-19 Daniel Bates <dbates@rim.com>

Reviewed by Adam Roben.

[Win] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37930

Implements DRT support for markerTextForListItem in the Windows port.

  • DumpRenderTree/win/LayoutTestControllerWin.cpp: (LayoutTestController::markerTextForListItem): Implemented.
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r63702 r63710  
     12010-07-19  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        [Win] Implement LayoutTestController::markerTextForListItem()
     6        https://bugs.webkit.org/show_bug.cgi?id=37930
     7
     8        Remove skipped layout tests now that we have DRT support.
     9
     10        * platform/win/Skipped:
     11
    1122010-07-19  Eric Carlson  <eric.carlson@apple.com>
    213
  • trunk/LayoutTests/platform/win/Skipped

    r63689 r63710  
    854854http/tests/security/xss-DENIED-iframe-src-alias.html
    855855
    856 # Missing an implementation of LayoutTestController::markerTextForListItem()
    857 fast/lists/ol-nested-items-dynamic-insert.html
    858 fast/lists/ol-nested-items-dynamic-remove.html
    859 fast/lists/ol-nested-items.html
    860 fast/lists/ol-nested-list-dynamic-insert.html
    861 fast/lists/ol-nested-list-dynamic-remove.html
    862 fast/lists/ol-nested-list.html
    863 
    864856# Doesn't support WOFF yet.
    865857fast/css/font-face-woff.html
  • trunk/WebKit/win/ChangeLog

    r63602 r63710  
     12010-07-19  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        [Win] Implement LayoutTestController::markerTextForListItem()
     6        https://bugs.webkit.org/show_bug.cgi?id=37930
     7
     8        Implements support for markerTextForListItem in the Windows port.
     9
     10        * DOMCoreClasses.cpp:
     11        (DOMElement::markerTextForListItem): Added.
     12        * DOMCoreClasses.h:
     13        * Interfaces/DOMPrivate.idl: Added declaration for markerTextForListItem().
     14        * Interfaces/IWebViewPrivate.idl: Added declaration for elementFromJS().
     15        * Interfaces/WebKit.idl: Touch it to force a rebuild (and for good luck :-)).
     16        * WebView.cpp:
     17        (WebView::elementFromJS): Added.
     18        * WebView.h:
     19
    1202010-07-16  Zhe Su  <suzhe@chromium.org>
    221
  • trunk/WebKit/win/DOMCoreClasses.cpp

    r55503 r63710  
    4949#include <WebCore/NodeList.h>
    5050#include <WebCore/RenderObject.h>
     51#include <WebCore/RenderTreeAsText.h>
    5152#pragma warning(pop)
    5253
     
    11501151}
    11511152
     1153HRESULT STDMETHODCALLTYPE DOMElement::markerTextForListItem(
     1154    /* [retval][out] */ BSTR* markerText)
     1155{
     1156    if (!markerText)
     1157        return E_POINTER;
     1158
     1159    ASSERT(m_element);
     1160
     1161    *markerText = BString(WebCore::markerTextForListItem(m_element)).release();
     1162    return S_OK;
     1163}
     1164
    11521165// IDOMElementCSSInlineStyle --------------------------------------------------
    11531166
  • trunk/WebKit/win/DOMCoreClasses.h

    r57129 r63710  
    777777        /* [retval][out] */ HBITMAP* image);
    778778
     779    virtual HRESULT STDMETHODCALLTYPE markerTextForListItem(
     780        /* [retval][out] */ BSTR* markerText);
     781
    779782    // IDOMElementCSSInlineStyle
    780783    virtual HRESULT STDMETHODCALLTYPE style(
  • trunk/WebKit/win/Interfaces/DOMPrivate.idl

    r51850 r63710  
    4848    [local] HRESULT font(WebFontDescription* webFontDescription);
    4949    HRESULT renderedImage([out, retval] HBITMAP* image);
     50    [local] HRESULT markerTextForListItem([out, retval] BSTR* markerText);
    5051}
    5152
  • trunk/WebKit/win/Interfaces/IWebViewPrivate.idl

    r60722 r63710  
    238238
    239239    [local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception);
     240
     241    [local] HRESULT elementFromJS([in] JSContextRef context, [in] JSValueRef nodeObject, [out, retval] IDOMElement** element);
    240242}
  • trunk/WebKit/win/Interfaces/WebKit.idl

    r63538 r63710  
    301301    }
    302302}
    303 
  • trunk/WebKit/win/WebView.cpp

    r63537 r63710  
    9696#include <WebCore/HitTestResult.h>
    9797#include <WebCore/IntRect.h>
     98#include <WebCore/JSElement.h>
    9899#include <WebCore/KeyboardEvent.h>
    99100#include <WebCore/Language.h>
     
    113114#include <WebCore/RenderLayer.h>
    114115#include <WebCore/RenderTheme.h>
     116#include <WebCore/RenderTreeAsText.h>
    115117#include <WebCore/RenderView.h>
    116118#include <WebCore/RenderWidget.h>
     
    56685670}
    56695671
     5672HRESULT STDMETHODCALLTYPE WebView::elementFromJS(
     5673    /* [in] */ JSContextRef context,
     5674    /* [in] */ JSValueRef nodeObject,
     5675    /* [retval][out] */ IDOMElement **element)
     5676{
     5677    if (!element)
     5678        return E_POINTER;
     5679
     5680    *element = 0;
     5681
     5682    if (!context)
     5683        return E_FAIL;
     5684
     5685    if (!nodeObject)
     5686        return E_FAIL;
     5687
     5688    JSLock lock(JSC::SilenceAssertionsOnly);
     5689    Element* elt = toElement(toJS(toJS(context), nodeObject));
     5690    if (!elt)
     5691        return E_FAIL;
     5692
     5693    *element = DOMElement::createInstance(elt);
     5694    return S_OK;
     5695}
     5696
    56705697HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerTimeDelay(
    56715698    /* [in] */ double timeDelay)
  • trunk/WebKit/win/WebView.h

    r63339 r63710  
    706706        /* [in] */ JSContextRef context,
    707707        /* [in] */ JSValueRef exception);
     708
     709    virtual HRESULT STDMETHODCALLTYPE elementFromJS(
     710        /* [in] */ JSContextRef context,
     711        /* [in] */ JSValueRef nodeObject,
     712        /* [retval][out] */ IDOMElement **element);
    708713
    709714    virtual HRESULT STDMETHODCALLTYPE setCustomHTMLTokenizerTimeDelay(
  • trunk/WebKitTools/ChangeLog

    r63703 r63710  
     12010-07-19  Daniel Bates  <dbates@rim.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        [Win] Implement LayoutTestController::markerTextForListItem()
     6        https://bugs.webkit.org/show_bug.cgi?id=37930
     7
     8        Implements DRT support for markerTextForListItem in the Windows port.
     9
     10        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     11        (LayoutTestController::markerTextForListItem): Implemented.
     12
    1132010-07-19  Jessie Berlin  <jberlin@apple.com>
    214
  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r62876 r63710  
    197197JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
    198198{
    199     // FIXME: Implement me.
    200     return JSRetainPtr<JSStringRef>();
     199    COMPtr<IWebView> webView;
     200    if (FAILED(frame->webView(&webView)))
     201        return 0;
     202
     203    COMPtr<IWebViewPrivate> webViewPrivate(Query, webView);
     204    if (!webViewPrivate)
     205        return 0;
     206
     207    COMPtr<IDOMElement> element;
     208    if (FAILED(webViewPrivate->elementFromJS(context, nodeObject, &element)))
     209        return 0;
     210
     211    COMPtr<IDOMElementPrivate> elementPrivate(Query, element);
     212    if (!elementPrivate)
     213        return 0;
     214
     215    BSTR textBSTR = 0;
     216    if (FAILED(elementPrivate->markerTextForListItem(&textBSTR)))
     217        return 0;
     218
     219    JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithBSTR(textBSTR));
     220    SysFreeString(textBSTR);
     221    return markerText;
    201222}
    202223
Note: See TracChangeset for help on using the changeset viewer.