[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 14:58:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c738b67f81340d3ca3b1606573b6da2c89f68762
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 26 18:38:56 2010 +0000
2010-10-26 Simon Fraser <simon.fraser at apple.com>
Reviewed by Sam Weinig.
Support layoutTestController.layerTreeAsText in WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=42145
Implement layerTreeAsText() in WebKitTestRunner.
* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::layerTreeAsText):
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
2010-10-26 Simon Fraser <simon.fraser at apple.com>
Reviewed by Sam Weinig.
Support layoutTestController.layerTreeAsText in WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=42145
Expose layerTreeAsText() as private API so that
WebKitTestRunner can use it.
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
(WKBundleFrameCopyLayerTreeAsText):
* WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::numberOfActiveAnimations):
(WebKit::WebFrame::layerTreeAsText):
(WebKit::WebFrame::pendingUnloadCount):
* WebProcess/WebPage/WebFrame.h:
2010-10-26 Simon Fraser <simon.fraser at apple.com>
Reviewed by Sam Weinig.
Support layoutTestController.layerTreeAsText in WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=42145
Unskip tests that relied on layerTreeAsText(), but skip
two compositing tests that continue to be flakey.
* platform/mac-wk2/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70548 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0f269a1..9e4c2d5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-26 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Support layoutTestController.layerTreeAsText in WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=42145
+
+ Unskip tests that relied on layerTreeAsText(), but skip
+ two compositing tests that continue to be flakey.
+
+ * platform/mac-wk2/Skipped:
+
2010-10-26 David Hyatt <hyatt at apple.com>
Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index f794484..8d6e085 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -37,49 +37,10 @@ platform/mac/accessibility
# <https://bugs.webkit.org/show_bug.cgi?id=42139>
fast/loader/null-request-after-willSendRequest.html
-# Support layoutTestController.layerTreeAsText in WebKitTestRunner
-# <https://bugs.webkit.org/show_bug.cgi?id=42145>
-compositing/layer-creation/scroll-partial-update.html
-compositing/animation/animation-compositing.html
-compositing/geometry/clip.html
-compositing/geometry/limit-layer-bounds-clipping-ancestor.html
-compositing/geometry/limit-layer-bounds-fixed-positioned.html
-compositing/geometry/limit-layer-bounds-overflow-root.html
-compositing/geometry/limit-layer-bounds-positioned-transition.html
-compositing/geometry/limit-layer-bounds-positioned.html
-compositing/geometry/limit-layer-bounds-transformed-overflow.html
-compositing/geometry/limit-layer-bounds-transformed.html
-compositing/geometry/preserve-3d-switching.html
-compositing/iframes/become-overlapped-iframe.html
-compositing/iframes/composited-parent-iframe.html
-compositing/iframes/connect-compositing-iframe-delayed.html
-compositing/iframes/connect-compositing-iframe.html
-compositing/iframes/connect-compositing-iframe2.html
-compositing/iframes/connect-compositing-iframe3.html
-compositing/iframes/enter-compositing-iframe.html
-compositing/iframes/iframe-resize.html
+# Some compositing tests flakey
+# https://bugs.webkit.org/show_bug.cgi?id=48354
compositing/iframes/iframe-size-from-zero.html
-compositing/iframes/iframe-size-to-zero.html
-compositing/iframes/iframe-src-change.html
-compositing/iframes/leave-compositing-iframe.html
-compositing/iframes/overlapped-iframe.html
-compositing/iframes/scrolling-iframe.html
-compositing/images/clip-on-directly-composited-image.html
-compositing/layer-creation/overflow-scroll-overlap.html
-compositing/overflow/clip-descendents.html
-compositing/overflow/resize-painting.html
-compositing/plugins/1x1-composited-plugin.html
-compositing/plugins/composited-plugin.html
-compositing/plugins/large-to-small-composited-plugin.html
-compositing/plugins/small-to-large-composited-plugin.html
-compositing/tiling/crash-reparent-tiled-layer.html
-compositing/tiling/huge-layer-add-remove-child.html
-compositing/tiling/huge-layer-resize.html
-compositing/tiling/huge-layer-with-layer-children-resize.html
-compositing/tiling/huge-layer-with-layer-children.html
-compositing/tiling/huge-layer.html
-compositing/tiling/huge-layer-img.html
-compositing/video/video-poster.html
+compositing/iframes/iframe-src-change.html
# Uncategorized editing failures
editing/deleting/delete-by-word-001.html
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0823ea3..cf55f71 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-26 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Support layoutTestController.layerTreeAsText in WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=42145
+
+ Expose layerTreeAsText() as private API so that
+ WebKitTestRunner can use it.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameCopyLayerTreeAsText):
+ * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h:
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::numberOfActiveAnimations):
+ (WebKit::WebFrame::layerTreeAsText):
+ (WebKit::WebFrame::pendingUnloadCount):
+ * WebProcess/WebPage/WebFrame.h:
+
2010-10-26 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
index 9197709..4df4a88 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -118,3 +118,8 @@ WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)
{
return toAPI(toImpl(frameRef)->page());
}
+
+WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frameRef)
+{
+ return toCopiedAPI(toImpl(frameRef)->layerTreeAsText());
+}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
index f5a216f..02d9e08 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
@@ -44,6 +44,7 @@ WK_EXPORT JSValueRef WKBundleFrameGetComputedStyleIncludingVisitedInfo(WKBundleF
WK_EXPORT unsigned WKBundleFrameGetNumberOfActiveAnimations(WKBundleFrameRef frame);
WK_EXPORT bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frame, WKStringRef name, WKStringRef elementID, double time);
WK_EXPORT unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frame);
+WK_EXPORT WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frame);
#ifdef __cplusplus
}
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index 954ec06..e36e255 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -275,7 +275,7 @@ PassRefPtr<ImmutableArray> WebFrame::childFrames()
return ImmutableArray::adopt(vector);
}
-unsigned WebFrame::numberOfActiveAnimations()
+unsigned WebFrame::numberOfActiveAnimations() const
{
if (!m_coreFrame)
return 0;
@@ -306,7 +306,15 @@ bool WebFrame::pauseAnimationOnElementWithId(const String& animationName, const
return controller->pauseAnimationAtTime(coreNode->renderer(), animationName, time);
}
-unsigned WebFrame::pendingUnloadCount()
+String WebFrame::layerTreeAsText() const
+{
+ if (!m_coreFrame)
+ return "";
+
+ return m_coreFrame->layerTreeAsText();
+}
+
+unsigned WebFrame::pendingUnloadCount() const
{
if (!m_coreFrame)
return 0;
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.h b/WebKit2/WebProcess/WebPage/WebFrame.h
index ef1cd35..bd13797 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.h
+++ b/WebKit2/WebProcess/WebPage/WebFrame.h
@@ -87,10 +87,11 @@ public:
static String counterValue(JSObjectRef element);
static String markerText(JSObjectRef element);
- unsigned numberOfActiveAnimations();
+ unsigned numberOfActiveAnimations() const;
bool pauseAnimationOnElementWithId(const String& animationName, const String& elementID, double time);
-
- unsigned pendingUnloadCount();
+ String layerTreeAsText() const;
+
+ unsigned pendingUnloadCount() const;
// Simple listener class used by plug-ins to know when frames finish or fail loading.
class LoadListener {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c97ed19..c771bec 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-26 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Support layoutTestController.layerTreeAsText in WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=42145
+
+ Implement layerTreeAsText() in WebKitTestRunner.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+ (WTR::LayoutTestController::layerTreeAsText):
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+
2010-10-26 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
index f3c5e88..33515b4 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
@@ -66,6 +66,9 @@ module WTR {
// UserContent testing.
void addUserScript(in DOMString source, in boolean runAtStart, in boolean allFrames);
void addUserStyleSheet(in DOMString source, in boolean allFrames);
+
+ // Compositing testing.
+ DOMString layerTreeAsText();
};
}
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
index f8cbd4f..9875020 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -148,6 +148,13 @@ bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef anima
return WKBundleFramePauseAnimationOnElementWithId(mainFrame, toWK(animationName).get(), toWK(elementId).get(), time);
}
+JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
+{
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
+ WKRetainPtr<WKStringRef> text(AdoptWK, WKBundleFrameCopyLayerTreeAsText(mainFrame));
+ return toJS(text);
+}
+
void LayoutTestController::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
{
WKRetainPtr<WKStringRef> sourceWK = toWK(source);
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index c892ba0..16754bd 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -90,6 +90,9 @@ public:
unsigned numberOfActiveAnimations() const;
bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
+ // Compositing testing.
+ JSRetainPtr<JSStringRef> layerTreeAsText() const;
+
// UserContent testing.
void addUserScript(JSStringRef source, bool runAtStart, bool allFrames);
void addUserStyleSheet(JSStringRef source, bool allFrames);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list