[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f81d4923eec00b835736f97996a71d70c73059b8
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 02:22:57 2010 +0000

    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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f67d9e3..b504404 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-07  Sam Weinig  <sam at 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 at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         WebKitTestRunner needs to print onunload handler information
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index dbeee15..086dda0 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -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
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c9909c0..ff94390 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,23 @@
 2010-08-07  Sam Weinig  <sam at 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 at webkit.org>
+
         Reviewed by Anders Carlsson.
 
         WebKitTestRunner needs to print onunload handler information
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
index 2eca583..7993d78 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
@@ -37,6 +37,7 @@ module WTR {
         void dumpEditingCallbacks();
         void dumpSelectionRect();
         void dumpStatusCallbacks();
+        void dumpTitleChanges();
 
         // Special options.
         void keepWebHistory();
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index f3b35ef..5c66336 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -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";
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
index 487cc43..f2393f1 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -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)
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index f4b33b8..7c3125c 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -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;

-- 
WebKit Debian packaging