Commit dea005f6 authored by mjs@apple.com's avatar mjs@apple.com

2010-07-13 Maciej Stachowiak <mjs@apple.com>

        Reviewed by Oliver Hunt.

        Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
        https://bugs.webkit.org/show_bug.cgi?id=42227

        * platform/mac-wk2/Skipped: Skip some tests newly revealed as failing
        for an already-classified reason.
2010-07-13  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Oliver Hunt.

        Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
        https://bugs.webkit.org/show_bug.cgi?id=42227

        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
        (WTR::LayoutTestController::LayoutTestController): Initialize new bool
        members.
        (WTR::LayoutTestController::display): Dummy method.
        (WTR::displayCallback): Call the dummy.
        (WTR::repaintSweepHorizontallyCallback): ditto
        (WTR::testRepaintCallback): ditto
        (WTR::LayoutTestController::staticFunctions): Expose new methods.
        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
        (WTR::LayoutTestController::setTestRepaint): Set the flag (which currently does
        nothing).
        (WTR::LayoutTestController::setTestRepaintSweepHorizontally): ditto


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4082256c
2010-07-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver Hunt.
Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42227
* platform/mac-wk2/Skipped: Skip some tests newly revealed as failing
for an already-classified reason.
2010-07-13 Eric Seidel <eric@webkit.org>
Reviewed by Adam Barth.
......@@ -88,6 +88,8 @@ 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/iframes/iframe-src-change.html
compositing/iframes/leave-compositing-iframe.html
# Support layoutTestController.dumpEditingDelegates in WebKitTestRunner
# <https://bugs.webkit.org/show_bug.cgi?id=42193>
......
2010-07-13 Maciej Stachowiak <mjs@apple.com>
Reviewed by Oliver Hunt.
Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42227
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::LayoutTestController): Initialize new bool
members.
(WTR::LayoutTestController::display): Dummy method.
(WTR::displayCallback): Call the dummy.
(WTR::repaintSweepHorizontallyCallback): ditto
(WTR::testRepaintCallback): ditto
(WTR::LayoutTestController::staticFunctions): Expose new methods.
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
(WTR::LayoutTestController::setTestRepaint): Set the flag (which currently does
nothing).
(WTR::LayoutTestController::setTestRepaintSweepHorizontally): ditto
2010-07-13 Andreas Kling <andreas.kling@nokia.com>
Unreviewed. Adding myself as committer.
......
......@@ -43,6 +43,8 @@ PassRefPtr<LayoutTestController> LayoutTestController::create(const std::string&
LayoutTestController::LayoutTestController(const std::string& testPathOrURL)
: m_dumpAsText(false)
, m_waitToDump(false)
, m_testRepaint(false)
, m_testRepaintSweepHorizontally(false)
, m_testPathOrURL(testPathOrURL)
{
}
......@@ -53,6 +55,10 @@ LayoutTestController::~LayoutTestController()
static const CFTimeInterval waitToDumpWatchdogInterval = 30.0;
void LayoutTestController::display()
{
// FIXME: actually implement, once we want pixel tests
}
void LayoutTestController::invalidateWaitToDumpWatchdog()
{
......@@ -109,6 +115,15 @@ bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef anima
return WKBundleFramePauseAnimationOnElementWithId(mainFrame, nameWK.get(), idWK.get(), time);
}
static JSValueRef displayCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
// Has mac & windows implementation
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
controller->display();
return JSValueMakeUndefined(context);
}
static JSValueRef dumpAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
......@@ -155,6 +170,20 @@ static JSValueRef pauseAnimationAtTimeOnElementWithIdCallback(JSContextRef conte
return JSValueMakeBoolean(context, controller->pauseAnimationAtTimeOnElementWithId(animationName.get(), time, elementId.get()));
}
static JSValueRef repaintSweepHorizontallyCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
controller->setTestRepaintSweepHorizontally();
return JSValueMakeUndefined(context);
}
static JSValueRef testRepaintCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
controller->setTestRepaint();
return JSValueMakeUndefined(context);
}
// Object Finalization
static void layoutTestControllerObjectFinalize(JSObjectRef object)
......@@ -191,10 +220,13 @@ JSClassRef LayoutTestController::getJSClass()
JSStaticFunction* LayoutTestController::staticFunctions()
{
static JSStaticFunction staticFunctions[] = {
{ "display", displayCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpAsText", dumpAsTextCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "numberOfActiveAnimations", numberOfActiveAnimationsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "pauseAnimationAtTimeOnElementWithId", pauseAnimationAtTimeOnElementWithIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "repaintSweepHorizontally", repaintSweepHorizontallyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "testRepaint", testRepaintCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "waitUntilDone", waitUntilDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0 }
};
......
......@@ -49,15 +49,22 @@ public:
void waitToDumpWatchdogTimerFired();
void invalidateWaitToDumpWatchdog();
void notifyDone();
void display();
unsigned numberOfActiveAnimations() const;
bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
void setTestRepaint() { m_testRepaint = true; }
void setTestRepaintSweepHorizontally() { m_testRepaintSweepHorizontally = true; }
private:
LayoutTestController(const std::string& testPathOrURL);
bool m_dumpAsText;
bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
bool m_testRepaint;
bool m_testRepaintSweepHorizontally;
std::string m_testPathOrURL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment