Changeset 63710 in webkit
- Timestamp:
- Jul 19, 2010 8:01:17 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r63702 r63710 1 2010-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 1 12 2010-07-19 Eric Carlson <eric.carlson@apple.com> 2 13 -
trunk/LayoutTests/platform/win/Skipped
r63689 r63710 854 854 http/tests/security/xss-DENIED-iframe-src-alias.html 855 855 856 # Missing an implementation of LayoutTestController::markerTextForListItem()857 fast/lists/ol-nested-items-dynamic-insert.html858 fast/lists/ol-nested-items-dynamic-remove.html859 fast/lists/ol-nested-items.html860 fast/lists/ol-nested-list-dynamic-insert.html861 fast/lists/ol-nested-list-dynamic-remove.html862 fast/lists/ol-nested-list.html863 864 856 # Doesn't support WOFF yet. 865 857 fast/css/font-face-woff.html -
trunk/WebKit/win/ChangeLog
r63602 r63710 1 2010-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 1 20 2010-07-16 Zhe Su <suzhe@chromium.org> 2 21 -
trunk/WebKit/win/DOMCoreClasses.cpp
r55503 r63710 49 49 #include <WebCore/NodeList.h> 50 50 #include <WebCore/RenderObject.h> 51 #include <WebCore/RenderTreeAsText.h> 51 52 #pragma warning(pop) 52 53 … … 1150 1151 } 1151 1152 1153 HRESULT 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 1152 1165 // IDOMElementCSSInlineStyle -------------------------------------------------- 1153 1166 -
trunk/WebKit/win/DOMCoreClasses.h
r57129 r63710 777 777 /* [retval][out] */ HBITMAP* image); 778 778 779 virtual HRESULT STDMETHODCALLTYPE markerTextForListItem( 780 /* [retval][out] */ BSTR* markerText); 781 779 782 // IDOMElementCSSInlineStyle 780 783 virtual HRESULT STDMETHODCALLTYPE style( -
trunk/WebKit/win/Interfaces/DOMPrivate.idl
r51850 r63710 48 48 [local] HRESULT font(WebFontDescription* webFontDescription); 49 49 HRESULT renderedImage([out, retval] HBITMAP* image); 50 [local] HRESULT markerTextForListItem([out, retval] BSTR* markerText); 50 51 } 51 52 -
trunk/WebKit/win/Interfaces/IWebViewPrivate.idl
r60722 r63710 238 238 239 239 [local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception); 240 241 [local] HRESULT elementFromJS([in] JSContextRef context, [in] JSValueRef nodeObject, [out, retval] IDOMElement** element); 240 242 } -
trunk/WebKit/win/Interfaces/WebKit.idl
r63538 r63710 301 301 } 302 302 } 303 -
trunk/WebKit/win/WebView.cpp
r63537 r63710 96 96 #include <WebCore/HitTestResult.h> 97 97 #include <WebCore/IntRect.h> 98 #include <WebCore/JSElement.h> 98 99 #include <WebCore/KeyboardEvent.h> 99 100 #include <WebCore/Language.h> … … 113 114 #include <WebCore/RenderLayer.h> 114 115 #include <WebCore/RenderTheme.h> 116 #include <WebCore/RenderTreeAsText.h> 115 117 #include <WebCore/RenderView.h> 116 118 #include <WebCore/RenderWidget.h> … … 5668 5670 } 5669 5671 5672 HRESULT 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 5670 5697 HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerTimeDelay( 5671 5698 /* [in] */ double timeDelay) -
trunk/WebKit/win/WebView.h
r63339 r63710 706 706 /* [in] */ JSContextRef context, 707 707 /* [in] */ JSValueRef exception); 708 709 virtual HRESULT STDMETHODCALLTYPE elementFromJS( 710 /* [in] */ JSContextRef context, 711 /* [in] */ JSValueRef nodeObject, 712 /* [retval][out] */ IDOMElement **element); 708 713 709 714 virtual HRESULT STDMETHODCALLTYPE setCustomHTMLTokenizerTimeDelay( -
trunk/WebKitTools/ChangeLog
r63703 r63710 1 2010-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 1 13 2010-07-19 Jessie Berlin <jberlin@apple.com> 2 14 -
trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
r62876 r63710 197 197 JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const 198 198 { 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; 201 222 } 202 223
Note: See TracChangeset
for help on using the changeset viewer.