Commit f81d4923 authored by weinig@apple.com's avatar weinig@apple.com
Browse files

WebKitTestRunner needs layoutTestController.dumpTitleChanges

<rdar://problem/8213861>
https://bugs.webkit.org/show_bug.cgi?id=42683

Reviewed by Maciej Stachowiak.

WebKitTools: 

* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didReceiveTitleForFrame):
(WTR::InjectedBundlePage::didFinishDocumentLoadForFrame):
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::LayoutTestController):
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
(WTR::LayoutTestController::dumpTitleChanges):
(WTR::LayoutTestController::shouldDumpTitleChanges):

LayoutTests: 

* platform/mac-wk2/Skipped:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64929 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d46da297
2010-08-07 Sam Weinig <sam@webkit.org>
Reviewed by Maciej Stachowiak.
WebKitTestRunner needs layoutTestController.dumpTitleChanges
<rdar://problem/8213861>
https://bugs.webkit.org/show_bug.cgi?id=42683
* platform/mac-wk2/Skipped:
2010-08-07 Sam Weinig <sam@webkit.org>
 
Reviewed by Anders Carlsson.
......@@ -1696,11 +1696,6 @@ userscripts/user-script-top-frame-only.html
fast/css/opacity-float.html
fast/js/navigator-language.html
# WebKitTestRunner needs layoutTestController.dumpTitleChanges
# <https://bugs.webkit.org/show_bug.cgi?id=42683>
fast/dom/title-text-property-2.html
fast/dom/title-text-property.html
# WebKitTestRunner needs layoutTestController.setCacheModel
# <https://bugs.webkit.org/show_bug.cgi?id=42684>
fast/dom/HTMLScriptElement/nested-execution.html
......
2010-08-07 Sam Weinig <sam@webkit.org>
Reviewed by Maciej Stachowiak.
WebKitTestRunner needs layoutTestController.dumpTitleChanges
<rdar://problem/8213861>
https://bugs.webkit.org/show_bug.cgi?id=42683
* WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didReceiveTitleForFrame):
(WTR::InjectedBundlePage::didFinishDocumentLoadForFrame):
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::LayoutTestController):
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
(WTR::LayoutTestController::dumpTitleChanges):
(WTR::LayoutTestController::shouldDumpTitleChanges):
2010-08-07 Sam Weinig <sam@webkit.org>
Reviewed by Anders Carlsson.
......
......@@ -37,6 +37,7 @@ module WTR {
void dumpEditingCallbacks();
void dumpSelectionRect();
void dumpStatusCallbacks();
void dumpTitleChanges();
// Special options.
void keepWebHistory();
......
......@@ -383,6 +383,10 @@ void InjectedBundlePage::didFailLoadWithErrorForFrame(WKBundleFrameRef frame)
void InjectedBundlePage::didReceiveTitleForFrame(WKStringRef title, WKBundleFrameRef frame)
{
if (!InjectedBundle::shared().layoutTestController()->shouldDumpTitleChanges())
return;
InjectedBundle::shared().os() << "TITLE CHANGED: " << title << "\n";
}
void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window)
......@@ -406,7 +410,6 @@ void InjectedBundlePage::didChangeLocationWithinPageForFrame(WKBundleFrameRef fr
void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundleFrameRef frame)
{
unsigned pendingFrameUnloadEvents = WKBundleFrameGetPendingUnloadCount(frame);
if (pendingFrameUnloadEvents)
InjectedBundle::shared().os() << frame << " - has " << pendingFrameUnloadEvents << " onunload handler(s)\n";
......
......@@ -88,6 +88,7 @@ LayoutTestController::LayoutTestController()
, m_shouldCloseExtraWindows(false)
, m_dumpEditingCallbacks(false)
, m_dumpStatusCallbacks(false)
, m_dumpTitleChanges(false)
, m_waitToDump(false)
, m_testRepaint(false)
, m_testRepaintSweepHorizontally(false)
......
......@@ -55,6 +55,7 @@ public:
void dumpEditingCallbacks() { m_dumpEditingCallbacks = true; }
void dumpSelectionRect() { } // Will need to do something when we support pixel tests.
void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
void dumpTitleChanges() { m_dumpTitleChanges = true; }
// Special options.
void keepWebHistory();
......@@ -87,6 +88,7 @@ public:
bool shouldDumpMainFrameScrollPosition() const { return m_whatToDump == RenderTree; }
bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
bool shouldDumpTitleChanges() const { return m_dumpTitleChanges; }
bool waitToDump() const { return m_waitToDump; }
void waitToDumpWatchdogTimerFired();
......@@ -107,6 +109,7 @@ private:
bool m_dumpEditingCallbacks;
bool m_dumpStatusCallbacks;
bool m_dumpTitleChanges;
bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
bool m_testRepaint;
bool m_testRepaintSweepHorizontally;
......
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