[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 11:20:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3347d30f28af53813405a3661a6f439a8d642b33
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 03:01:17 2010 +0000
2010-07-19 Daniel Bates <dbates at 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 at 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 at 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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d306695..fe9a8fc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-19 Daniel Bates <dbates at 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 Eric Carlson <eric.carlson at apple.com>
Unreviewed, build fix.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index e506cea..22612b3 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -853,14 +853,6 @@ fast/events/ondrop-text-html.html
# <http://webkit.org/b/37096> http/tests/security/xss-DENIED-iframe-src-alias.html sometimes times out on Windows
http/tests/security/xss-DENIED-iframe-src-alias.html
-# Missing an implementation of LayoutTestController::markerTextForListItem()
-fast/lists/ol-nested-items-dynamic-insert.html
-fast/lists/ol-nested-items-dynamic-remove.html
-fast/lists/ol-nested-items.html
-fast/lists/ol-nested-list-dynamic-insert.html
-fast/lists/ol-nested-list-dynamic-remove.html
-fast/lists/ol-nested-list.html
-
# Doesn't support WOFF yet.
fast/css/font-face-woff.html
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 87c7b18..1a92dd0 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,22 @@
+2010-07-19 Daniel Bates <dbates at 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-16 Zhe Su <suzhe at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebKit/win/DOMCoreClasses.cpp b/WebKit/win/DOMCoreClasses.cpp
index 4e8af61..42e8e63 100644
--- a/WebKit/win/DOMCoreClasses.cpp
+++ b/WebKit/win/DOMCoreClasses.cpp
@@ -48,6 +48,7 @@
#include <WebCore/HTMLTextAreaElement.h>
#include <WebCore/NodeList.h>
#include <WebCore/RenderObject.h>
+#include <WebCore/RenderTreeAsText.h>
#pragma warning(pop)
#include <initguid.h>
@@ -1149,6 +1150,18 @@ HRESULT STDMETHODCALLTYPE DOMElement::renderedImage(HBITMAP* image)
return S_OK;
}
+HRESULT STDMETHODCALLTYPE DOMElement::markerTextForListItem(
+ /* [retval][out] */ BSTR* markerText)
+{
+ if (!markerText)
+ return E_POINTER;
+
+ ASSERT(m_element);
+
+ *markerText = BString(WebCore::markerTextForListItem(m_element)).release();
+ return S_OK;
+}
+
// IDOMElementCSSInlineStyle --------------------------------------------------
HRESULT STDMETHODCALLTYPE DOMElement::style(
diff --git a/WebKit/win/DOMCoreClasses.h b/WebKit/win/DOMCoreClasses.h
index f8a3dbb..c52d933 100644
--- a/WebKit/win/DOMCoreClasses.h
+++ b/WebKit/win/DOMCoreClasses.h
@@ -776,6 +776,9 @@ public:
virtual HRESULT STDMETHODCALLTYPE renderedImage(
/* [retval][out] */ HBITMAP* image);
+ virtual HRESULT STDMETHODCALLTYPE markerTextForListItem(
+ /* [retval][out] */ BSTR* markerText);
+
// IDOMElementCSSInlineStyle
virtual HRESULT STDMETHODCALLTYPE style(
/* [retval][out] */ IDOMCSSStyleDeclaration** result);
diff --git a/WebKit/win/Interfaces/DOMPrivate.idl b/WebKit/win/Interfaces/DOMPrivate.idl
index 3365565..c3bb60e 100644
--- a/WebKit/win/Interfaces/DOMPrivate.idl
+++ b/WebKit/win/Interfaces/DOMPrivate.idl
@@ -47,6 +47,7 @@ interface IDOMElementPrivate : IUnknown
HRESULT innerText([out, retval] BSTR* result);
[local] HRESULT font(WebFontDescription* webFontDescription);
HRESULT renderedImage([out, retval] HBITMAP* image);
+ [local] HRESULT markerTextForListItem([out, retval] BSTR* markerText);
}
/*
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 352ae7e..0377406 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -237,4 +237,6 @@ interface IWebViewPrivate : IUnknown
HRESULT paintScrollViewRectToContextAtPoint([in] RECT rect, [in] POINT pt, [in] OLE_HANDLE dc);
[local] HRESULT reportException([in] JSContextRef context, [in] JSValueRef exception);
+
+ [local] HRESULT elementFromJS([in] JSContextRef context, [in] JSValueRef nodeObject, [out, retval] IDOMElement** element);
}
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index ce2f213..8938501 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -300,4 +300,3 @@ library WebKit
[default] interface IWebUserContentURLPattern;
}
}
-
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 441ebb9..fb0aad5 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -95,6 +95,7 @@
#include <WebCore/HitTestRequest.h>
#include <WebCore/HitTestResult.h>
#include <WebCore/IntRect.h>
+#include <WebCore/JSElement.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/Language.h>
#include <WebCore/Logging.h>
@@ -112,6 +113,7 @@
#include <WebCore/ProgressTracker.h>
#include <WebCore/RenderLayer.h>
#include <WebCore/RenderTheme.h>
+#include <WebCore/RenderTreeAsText.h>
#include <WebCore/RenderView.h>
#include <WebCore/RenderWidget.h>
#include <WebCore/ResourceHandle.h>
@@ -5667,6 +5669,31 @@ HRESULT STDMETHODCALLTYPE WebView::reportException(
return S_OK;
}
+HRESULT STDMETHODCALLTYPE WebView::elementFromJS(
+ /* [in] */ JSContextRef context,
+ /* [in] */ JSValueRef nodeObject,
+ /* [retval][out] */ IDOMElement **element)
+{
+ if (!element)
+ return E_POINTER;
+
+ *element = 0;
+
+ if (!context)
+ return E_FAIL;
+
+ if (!nodeObject)
+ return E_FAIL;
+
+ JSLock lock(JSC::SilenceAssertionsOnly);
+ Element* elt = toElement(toJS(toJS(context), nodeObject));
+ if (!elt)
+ return E_FAIL;
+
+ *element = DOMElement::createInstance(elt);
+ return S_OK;
+}
+
HRESULT STDMETHODCALLTYPE WebView::setCustomHTMLTokenizerTimeDelay(
/* [in] */ double timeDelay)
{
diff --git a/WebKit/win/WebView.h b/WebKit/win/WebView.h
index 2ab9795..c7e7605 100644
--- a/WebKit/win/WebView.h
+++ b/WebKit/win/WebView.h
@@ -706,6 +706,11 @@ public:
/* [in] */ JSContextRef context,
/* [in] */ JSValueRef exception);
+ virtual HRESULT STDMETHODCALLTYPE elementFromJS(
+ /* [in] */ JSContextRef context,
+ /* [in] */ JSValueRef nodeObject,
+ /* [retval][out] */ IDOMElement **element);
+
virtual HRESULT STDMETHODCALLTYPE setCustomHTMLTokenizerTimeDelay(
/* [in] */ double timeDelay);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e95d32c..03827f9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-19 Daniel Bates <dbates at 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.
+
2010-07-19 Jessie Berlin <jberlin at apple.com>
Windows build fix. Unreviewed.
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index b79bb2a..a29623e 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -196,8 +196,29 @@ JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
- // FIXME: Implement me.
- return JSRetainPtr<JSStringRef>();
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return 0;
+
+ COMPtr<IWebViewPrivate> webViewPrivate(Query, webView);
+ if (!webViewPrivate)
+ return 0;
+
+ COMPtr<IDOMElement> element;
+ if (FAILED(webViewPrivate->elementFromJS(context, nodeObject, &element)))
+ return 0;
+
+ COMPtr<IDOMElementPrivate> elementPrivate(Query, element);
+ if (!elementPrivate)
+ return 0;
+
+ BSTR textBSTR = 0;
+ if (FAILED(elementPrivate->markerTextForListItem(&textBSTR)))
+ return 0;
+
+ JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithBSTR(textBSTR));
+ SysFreeString(textBSTR);
+ return markerText;
}
void LayoutTestController::waitForPolicyDelegate()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list