Commit c8d9beb4 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

2010-10-25 Johnny Ding <jnd@chromium.org>

        Reviewed by Tony Chang.

        Dump the gesture status of frame in frame load callbacks in DumpRenderTree
        by adding a new method dumpUserGestureInFrameLoadCallbacks.
        Now only dump the gesture status in "DidStartProvisionalLoad" callback.
        https://bugs.webkit.org/show_bug.cgi?id=47849

        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
        (DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader):
        * WebCoreSupport/DumpRenderTreeSupportQt.h:
        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (drtPrintFrameUserGestureStatus):
        (WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents):
        (WebCore::FrameLoaderClientQt::dispatchDidPushStateWithinPage):
        (WebCore::FrameLoaderClientQt::dispatchDidReplaceStateWithinPage):
        (WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
        (WebCore::FrameLoaderClientQt::dispatchDidStartProvisionalLoad):
        * WebCoreSupport/FrameLoaderClientQt.h:
2010-10-25  Johnny Ding  <jnd@chromium.org>

        Reviewed by Tony Chang.

        Dump the gesture status of frame in frame load callbacks in DumpRenderTree
        by adding a new method dumpUserGestureInFrameLoadCallbacks.
        Now only dump the gesture status in "DidStartProvisionalLoad" callback.
        https://bugs.webkit.org/show_bug.cgi?id=47849

        * DumpRenderTree/LayoutTestController.cpp:
        (LayoutTestController::LayoutTestController):
        (dumpUserGestureInFrameLoadCallbacksCallback):
        (LayoutTestController::staticFunctions):
        * DumpRenderTree/LayoutTestController.h:
        (LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
        (LayoutTestController::setDumpUserGestureInFrameLoadCallbacks):
        * DumpRenderTree/chromium/LayoutTestController.cpp:
        (LayoutTestController::LayoutTestController):
        (LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
        (LayoutTestController::reset):
        * DumpRenderTree/chromium/LayoutTestController.h:
        (LayoutTestController::shouldDumpUserGestureInFrameLoadCallbacks):
        (LayoutTestController::setShouldDumpUserGestureInFrameLoadCallbacks):
        * DumpRenderTree/chromium/TestShell.h:
        (TestShell::shouldDumpUserGestureInFrameLoadCallbacks):
        * DumpRenderTree/chromium/WebViewHost.cpp:
        (WebViewHost::didStartProvisionalLoad):
        (WebViewHost::printFrameUserGestureStatus):
        * DumpRenderTree/chromium/WebViewHost.h:
        * DumpRenderTree/mac/FrameLoadDelegate.mm:
        (-[WebFrame _drt_printFrameUserGestureStatus]):
        (-[FrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
        (-[FrameLoadDelegate webView:didCommitLoadForFrame:]):
        (-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
        (-[FrameLoadDelegate webView:didFinishLoadForFrame:]):
        (-[FrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
        (-[FrameLoadDelegate webView:windowScriptObjectAvailable:]):
        (-[FrameLoadDelegate webView:didReceiveTitle:forFrame:]):
        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
        (LayoutTestController::reset):
        (LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
        * DumpRenderTree/qt/LayoutTestControllerQt.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70470 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1f905ca0
2010-10-25 Johnny Ding <jnd@chromium.org>
Reviewed by Tony Chang.
Dump the gesture status of frame in frame load callbacks in DumpRenderTree
by adding a new method dumpUserGestureInFrameLoadCallbacks.
Now only dump the gesture status in "DidStartProvisionalLoad" callback.
https://bugs.webkit.org/show_bug.cgi?id=47849
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader):
* WebCoreSupport/DumpRenderTreeSupportQt.h:
* WebCoreSupport/FrameLoaderClientQt.cpp:
(drtPrintFrameUserGestureStatus):
(WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents):
(WebCore::FrameLoaderClientQt::dispatchDidPushStateWithinPage):
(WebCore::FrameLoaderClientQt::dispatchDidReplaceStateWithinPage):
(WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
(WebCore::FrameLoaderClientQt::dispatchDidStartProvisionalLoad):
* WebCoreSupport/FrameLoaderClientQt.h:
2010-10-22 Sam Weinig <sam@webkit.org>
 
Reviewed by Anders Carlsson.
......
......@@ -561,6 +561,11 @@ void DumpRenderTreeSupportQt::dumpFrameLoader(bool b)
FrameLoaderClientQt::dumpFrameLoaderCallbacks = b;
}
void DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(bool b)
{
FrameLoaderClientQt::dumpUserGestureInFrameLoaderCallbacks = b;
}
void DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(bool b)
{
FrameLoaderClientQt::dumpResourceLoadCallbacks = b;
......
......@@ -101,6 +101,7 @@ public:
static QString plainText(const QVariant& rng);
static void dumpFrameLoader(bool b);
static void dumpUserGestureInFrameLoader(bool b);
static void dumpResourceLoadCallbacks(bool b);
static void dumpResourceResponseMIMETypes(bool b);
static void dumpResourceLoadCallbacksPath(const QString& path);
......
......@@ -106,6 +106,13 @@ static QString drtDescriptionSuitableForTestResult(WebCore::Frame* _frame)
}
}
static QString drtPrintFrameUserGestureStatus(WebCore::Frame* frame)
{
if (frame->loader()->isProcessingUserGesture())
return QString::fromLatin1("Frame with user gesture \"%1\"").arg(QLatin1String("true"));
return QString::fromLatin1("Frame with user gesture \"%1\"").arg(QLatin1String("false"));
}
static QString drtDescriptionSuitableForTestResult(const WebCore::KURL& _url)
{
if (_url.isEmpty() || !_url.isLocalFile())
......@@ -159,6 +166,7 @@ namespace WebCore
{
bool FrameLoaderClientQt::dumpFrameLoaderCallbacks = false;
bool FrameLoaderClientQt::dumpUserGestureInFrameLoaderCallbacks = false;
bool FrameLoaderClientQt::dumpResourceLoadCallbacks = false;
bool FrameLoaderClientQt::sendRequestReturnsNullOnRedirect = false;
bool FrameLoaderClientQt::sendRequestReturnsNull = false;
......@@ -314,7 +322,6 @@ void FrameLoaderClientQt::dispatchDidHandleOnloadEvents()
// don't need this one
if (dumpFrameLoaderCallbacks)
printf("%s - didHandleOnloadEventsForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
}
......@@ -373,7 +380,7 @@ void FrameLoaderClientQt::dispatchDidPushStateWithinPage()
{
if (dumpFrameLoaderCallbacks)
printf("%s - dispatchDidPushStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
notImplemented();
}
......@@ -381,7 +388,7 @@ void FrameLoaderClientQt::dispatchDidReplaceStateWithinPage()
{
if (dumpFrameLoaderCallbacks)
printf("%s - dispatchDidReplaceStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
notImplemented();
}
......@@ -389,7 +396,7 @@ void FrameLoaderClientQt::dispatchDidPopStateWithinPage()
{
if (dumpFrameLoaderCallbacks)
printf("%s - dispatchDidPopStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
notImplemented();
}
......@@ -403,6 +410,9 @@ void FrameLoaderClientQt::dispatchDidStartProvisionalLoad()
if (dumpFrameLoaderCallbacks)
printf("%s - didStartProvisionalLoadForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
if (dumpUserGestureInFrameLoaderCallbacks)
printf("%s - in didStartProvisionalLoadForFrame\n", qPrintable(drtPrintFrameUserGestureStatus(m_frame)));
if (m_webFrame)
emit m_webFrame->provisionalLoad();
}
......
......@@ -233,6 +233,7 @@ public:
virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext();
static bool dumpFrameLoaderCallbacks;
static bool dumpUserGestureInFrameLoaderCallbacks;
static bool dumpResourceLoadCallbacks;
static bool dumpResourceResponseMIMETypes;
static QString dumpResourceLoadCallbacksPath;
......
2010-10-25 Johnny Ding <jnd@chromium.org>
Reviewed by Tony Chang.
Dump the gesture status of frame in frame load callbacks in DumpRenderTree
by adding a new method dumpUserGestureInFrameLoadCallbacks.
Now only dump the gesture status in "DidStartProvisionalLoad" callback.
https://bugs.webkit.org/show_bug.cgi?id=47849
* DumpRenderTree/LayoutTestController.cpp:
(LayoutTestController::LayoutTestController):
(dumpUserGestureInFrameLoadCallbacksCallback):
(LayoutTestController::staticFunctions):
* DumpRenderTree/LayoutTestController.h:
(LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
(LayoutTestController::setDumpUserGestureInFrameLoadCallbacks):
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::LayoutTestController):
(LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
(LayoutTestController::reset):
* DumpRenderTree/chromium/LayoutTestController.h:
(LayoutTestController::shouldDumpUserGestureInFrameLoadCallbacks):
(LayoutTestController::setShouldDumpUserGestureInFrameLoadCallbacks):
* DumpRenderTree/chromium/TestShell.h:
(TestShell::shouldDumpUserGestureInFrameLoadCallbacks):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::didStartProvisionalLoad):
(WebViewHost::printFrameUserGestureStatus):
* DumpRenderTree/chromium/WebViewHost.h:
* DumpRenderTree/mac/FrameLoadDelegate.mm:
(-[WebFrame _drt_printFrameUserGestureStatus]):
(-[FrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
(-[FrameLoadDelegate webView:didCommitLoadForFrame:]):
(-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
(-[FrameLoadDelegate webView:didFinishLoadForFrame:]):
(-[FrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
(-[FrameLoadDelegate webView:windowScriptObjectAvailable:]):
(-[FrameLoadDelegate webView:didReceiveTitle:forFrame:]):
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::reset):
(LayoutTestController::dumpUserGestureInFrameLoadCallbacks):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
2010-10-25 Sheriff Bot <webkit.review.bot@gmail.com>
 
Unreviewed, rolling out r70442.
......
......@@ -51,6 +51,7 @@ LayoutTestController::LayoutTestController(const std::string& testPathOrURL, con
, m_dumpDatabaseCallbacks(false)
, m_dumpEditingCallbacks(false)
, m_dumpFrameLoadCallbacks(false)
, m_dumpUserGestureInFrameLoadCallbacks(false)
, m_dumpHistoryDelegateCallbacks(false)
, m_dumpResourceLoadCallbacks(false)
, m_dumpResourceResponseMIMETypes(false)
......@@ -167,6 +168,13 @@ static JSValueRef dumpFrameLoadCallbacksCallback(JSContextRef context, JSObjectR
return JSValueMakeUndefined(context);
}
static JSValueRef dumpUserGestureInFrameLoadCallbacksCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
controller->setDumpUserGestureInFrameLoadCallbacks(true);
return JSValueMakeUndefined(context);
}
static JSValueRef dumpResourceLoadCallbacksCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
......@@ -1889,6 +1897,7 @@ JSStaticFunction* LayoutTestController::staticFunctions()
{ "dumpDatabaseCallbacks", dumpDatabaseCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpEditingCallbacks", dumpEditingCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpFrameLoadCallbacks", dumpFrameLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpUserGestureInFrameLoadCallbacks", dumpUserGestureInFrameLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpResourceLoadCallbacks", dumpResourceLoadCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpResourceResponseMIMETypes", dumpResourceResponseMIMETypesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpSelectionRect", dumpSelectionRectCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
......
......@@ -154,6 +154,9 @@ public:
bool dumpFrameLoadCallbacks() const { return m_dumpFrameLoadCallbacks; }
void setDumpFrameLoadCallbacks(bool dumpFrameLoadCallbacks) { m_dumpFrameLoadCallbacks = dumpFrameLoadCallbacks; }
bool dumpUserGestureInFrameLoadCallbacks() const { return m_dumpUserGestureInFrameLoadCallbacks; }
void setDumpUserGestureInFrameLoadCallbacks(bool dumpUserGestureInFrameLoadCallbacks) { m_dumpUserGestureInFrameLoadCallbacks = dumpUserGestureInFrameLoadCallbacks; }
bool dumpHistoryDelegateCallbacks() const { return m_dumpHistoryDelegateCallbacks; }
void setDumpHistoryDelegateCallbacks(bool dumpHistoryDelegateCallbacks) { m_dumpHistoryDelegateCallbacks = dumpHistoryDelegateCallbacks; }
......@@ -311,6 +314,7 @@ private:
bool m_dumpDatabaseCallbacks;
bool m_dumpEditingCallbacks;
bool m_dumpFrameLoadCallbacks;
bool m_dumpUserGestureInFrameLoadCallbacks;
bool m_dumpHistoryDelegateCallbacks;
bool m_dumpResourceLoadCallbacks;
bool m_dumpResourceResponseMIMETypes;
......
......@@ -94,6 +94,7 @@ LayoutTestController::LayoutTestController(TestShell* shell)
bindMethod("dumpDatabaseCallbacks", &LayoutTestController::dumpDatabaseCallbacks);
bindMethod("dumpEditingCallbacks", &LayoutTestController::dumpEditingCallbacks);
bindMethod("dumpFrameLoadCallbacks", &LayoutTestController::dumpFrameLoadCallbacks);
bindMethod("dumpUserGestureInFrameLoadCallbacks", &LayoutTestController::dumpUserGestureInFrameLoadCallbacks);
bindMethod("dumpResourceLoadCallbacks", &LayoutTestController::dumpResourceLoadCallbacks);
bindMethod("dumpResourceResponseMIMETypes", &LayoutTestController::dumpResourceResponseMIMETypes);
bindMethod("dumpSelectionRect", &LayoutTestController::dumpSelectionRect);
......@@ -288,6 +289,12 @@ void LayoutTestController::dumpFrameLoadCallbacks(const CppArgumentList&, CppVar
result->setNull();
}
void LayoutTestController::dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, CppVariant* result)
{
m_dumpUserGestureInFrameLoadCallbacks = true;
result->setNull();
}
void LayoutTestController::dumpResourceLoadCallbacks(const CppArgumentList&, CppVariant* result)
{
m_dumpResourceLoadCallbacks = true;
......@@ -522,6 +529,7 @@ void LayoutTestController::reset()
m_dumpAsText = false;
m_dumpEditingCallbacks = false;
m_dumpFrameLoadCallbacks = false;
m_dumpUserGestureInFrameLoadCallbacks = false;
m_dumpResourceLoadCallbacks = false;
m_dumpResourceResponseMIMETypes = false;
m_dumpBackForwardList = false;
......
......@@ -88,6 +88,11 @@ public:
// ignores any that may be present.
void dumpFrameLoadCallbacks(const CppArgumentList&, CppVariant*);
// This function sets a flag that tells the test_shell to print a line of
// user gesture status text for some frame load callbacks. It takes no
// arguments, and ignores any that may be present.
void dumpUserGestureInFrameLoadCallbacks(const CppArgumentList&, CppVariant*);
// This function sets a flag that tells the test_shell to print out a text
// representation of the back/forward list. It ignores all arguments.
void dumpBackForwardList(const CppArgumentList&, CppVariant*);
......@@ -340,6 +345,8 @@ public:
bool shouldDumpEditingCallbacks() { return m_dumpEditingCallbacks; }
bool shouldDumpFrameLoadCallbacks() { return m_dumpFrameLoadCallbacks; }
void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; }
bool shouldDumpUserGestureInFrameLoadCallbacks() { return m_dumpUserGestureInFrameLoadCallbacks; }
void setShouldDumpUserGestureInFrameLoadCallbacks(bool value) { m_dumpUserGestureInFrameLoadCallbacks = value; }
bool shouldDumpResourceLoadCallbacks() {return m_dumpResourceLoadCallbacks; }
void setShouldDumpResourceResponseMIMETypes(bool value) { m_dumpResourceResponseMIMETypes = value; }
bool shouldDumpResourceResponseMIMETypes() {return m_dumpResourceResponseMIMETypes; }
......@@ -460,6 +467,10 @@ private:
// load callback.
bool m_dumpFrameLoadCallbacks;
// If true, the test_shell will output a line of the user gesture status
// text for some frame load callbacks.
bool m_dumpUserGestureInFrameLoadCallbacks;
// If true, the test_shell will output a descriptive line for each resource
// load callback.
bool m_dumpResourceLoadCallbacks;
......
......@@ -109,6 +109,7 @@ public:
void setFocus(WebKit::WebWidget*, bool enable);
bool shouldDumpFrameLoadCallbacks() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpFrameLoadCallbacks(); }
bool shouldDumpUserGestureInFrameLoadCallbacks() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpUserGestureInFrameLoadCallbacks(); }
bool shouldDumpResourceLoadCallbacks() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpResourceLoadCallbacks(); }
bool shouldDumpResourceResponseMIMETypes() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpResourceResponseMIMETypes(); }
void setIsLoading(bool flag) { m_isLoading = flag; }
......
......@@ -813,6 +813,8 @@ void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds)
void WebViewHost::didStartProvisionalLoad(WebFrame* frame)
{
if (m_shell->shouldDumpUserGestureInFrameLoadCallbacks())
printFrameUserGestureStatus(frame, " - in didStartProvisionalLoadForFrame\n");
if (m_shell->shouldDumpFrameLoadCallbacks()) {
printFrameDescription(frame);
fputs(" - didStartProvisionalLoadForFrame\n", stdout);
......@@ -1305,6 +1307,12 @@ void WebViewHost::printFrameDescription(WebFrame* webframe)
printf("frame \"%s\"", name8.c_str());
}
void WebViewHost::printFrameUserGestureStatus(WebFrame* webframe, const char* msg)
{
bool isUserGesture = webframe->isProcessingUserGesture();
printf("Frame with user gesture \"%s\"%s", isUserGesture ? "true" : "false", msg);
}
void WebViewHost::printResourceDescription(unsigned identifier)
{
ResourceMap::iterator it = m_resourceIdentifierMap.find(identifier);
......
......@@ -220,6 +220,9 @@ private:
// Dumping a frame to the console.
void printFrameDescription(WebKit::WebFrame*);
// Dumping the user gesture status to the console.
void printFrameUserGestureStatus(WebKit::WebFrame*, const char*);
bool hasWindow() const { return m_hasWindow; }
void resetScrollRect();
void discardBackingStore();
......
......@@ -50,6 +50,7 @@
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebScriptWorld.h>
#import <WebKit/WebSecurityOriginPrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <wtf/Assertions.h>
@interface NSURL (DRTExtras)
......@@ -89,6 +90,12 @@
return @"frame (anonymous)";
}
}
- (NSString *)_drt_printFrameUserGestureStatus
{
BOOL isUserGesture = [[self webView] _isProcessingUserGesture];
return [NSString stringWithFormat:@"Frame with user gesture \"%@\"", isUserGesture ? @"true" : @"false"];
}
@end
@implementation FrameLoadDelegate
......@@ -146,7 +153,12 @@
NSString *string = [NSString stringWithFormat:@"%@ - didStartProvisionalLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
printf ("%s\n", [string UTF8String]);
}
if (!done && gLayoutTestController->dumpUserGestureInFrameLoadCallbacks()) {
NSString *string = [NSString stringWithFormat:@"%@ - in didStartProvisionalLoadForFrame", [frame _drt_printFrameUserGestureStatus]];
printf ("%s\n", [string UTF8String]);
}
ASSERT([frame provisionalDataSource]);
// Make sure we only set this once per test. If it gets cleared, and then set again, we might
// end up doing two dumps for one test.
......@@ -166,7 +178,7 @@
NSString *string = [NSString stringWithFormat:@"%@ - didCommitLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
printf ("%s\n", [string UTF8String]);
}
ASSERT(![frame provisionalDataSource]);
ASSERT([frame dataSource]);
......@@ -190,7 +202,7 @@
ASSERT_NOT_REACHED();
return;
}
ASSERT([frame provisionalDataSource]);
[self webView:sender locationChangeDone:error forDataSource:[frame provisionalDataSource]];
}
......@@ -204,7 +216,7 @@
NSString *string = [NSString stringWithFormat:@"%@ - didFinishLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
printf ("%s\n", [string UTF8String]);
}
// FIXME: This call to displayIfNeeded can be removed when <rdar://problem/5092361> is fixed.
// After that is fixed, we will reenable painting after WebCore is done loading the document,
// and this call will no longer be needed.
......@@ -220,7 +232,7 @@
NSString *string = [NSString stringWithFormat:@"%@ - didFailLoadWithError", [frame _drt_descriptionSuitableForTestResult]];
printf ("%s\n", [string UTF8String]);
}
ASSERT(![frame provisionalDataSource]);
ASSERT([frame dataSource]);
......@@ -233,7 +245,7 @@
NSString *string = [NSString stringWithFormat:@"?? - windowScriptObjectAvailable"];
printf ("%s\n", [string UTF8String]);
}
ASSERT_NOT_REACHED();
}
......@@ -314,7 +326,7 @@
NSString *string = [NSString stringWithFormat:@"%@ - didReceiveTitle: %@", [frame _drt_descriptionSuitableForTestResult], title];
printf ("%s\n", [string UTF8String]);
}
if (gLayoutTestController->dumpTitleChanges())
printf("TITLE CHANGED: %s\n", [title UTF8String]);
}
......
......@@ -73,6 +73,7 @@ void LayoutTestController::reset()
DumpRenderTreeSupportQt::dumpEditingCallbacks(false);
DumpRenderTreeSupportQt::dumpFrameLoader(false);
DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(false);
DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(false);
DumpRenderTreeSupportQt::dumpResourceResponseMIMETypes(false);
DumpRenderTreeSupportQt::setDeferMainResourceDataLoad(true);
......@@ -246,6 +247,11 @@ void LayoutTestController::dumpFrameLoadCallbacks()
DumpRenderTreeSupportQt::dumpFrameLoader(true);
}
void LayoutTestController::dumpUserGestureInFrameLoadCallbacks()
{
DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(true);
}
void LayoutTestController::dumpResourceLoadCallbacks()
{
DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(true);
......
......@@ -106,6 +106,7 @@ public slots:
void handleErrorPages() { m_handleErrorPages = true; }
void dumpEditingCallbacks();
void dumpFrameLoadCallbacks();
void dumpUserGestureInFrameLoadCallbacks();
void dumpResourceLoadCallbacks();
void dumpResourceResponseMIMETypes();
void dumpHistoryCallbacks();
......
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