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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e0dc1dea8c5493e39674fd9b6ad620f607bf2b3e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 01:39:23 2010 +0000

    2010-10-11  Prasad Tammana  <prasadt at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            Added support for showModalDialog on chromium port.
    
            Implement showModalDialog for Layout tests for chromium port
            https://bugs.webkit.org/show_bug.cgi?id=46759
    
            * platform/chromium/drt_expectations.txt:  Removed show-modal-dialog tests.
    2010-10-11  Prasad Tammana  <prasadt at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            Added support for showModalDialog on chromium port.
    
            Implement showModalDialog for Layout tests for chromium port
            https://bugs.webkit.org/show_bug.cgi?id=46759
    
            * DumpRenderTree/chromium/WebViewHost.cpp:
            (WebViewHost::closeWidgetSoon): Quit current message loop if in a modal loop.
            (WebViewHost::runModal):  Start a nested message loop and remember that.
            (WebViewHost::WebViewHost):  Initialize m_inModalLoop.
            * DumpRenderTree/chromium/WebViewHost.h:  Add m_inModalLoop.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 15a8c3e..2a213fb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-11  Prasad Tammana  <prasadt at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Added support for showModalDialog on chromium port.
+
+        Implement showModalDialog for Layout tests for chromium port
+        https://bugs.webkit.org/show_bug.cgi?id=46759
+
+        * platform/chromium/drt_expectations.txt:  Removed show-modal-dialog tests.
+
 2010-10-11  Albert J. Wong  <ajwong at chromium.org>
 
         [chromium] Unreviewed. Build fix.
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 0b734e0..79c992b 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -63,10 +63,6 @@ BUG_DRT LINUX : fast/text/international/003.html = IMAGE
 // CJK characters are not rotated.
 BUG_DRT LINUX : svg/batik/text/verticalText.svg = IMAGE+TEXT
 
-// Need modal dialog support.
-BUG_DRT WIN : fast/events/show-modal-dialog-onblur-onfocus.html = TEXT
-BUG_DRT WIN : fast/harness/show-modal-dialog.html = TEXT
-
 // This is an error which test_shell can't find.
 BUGWK43960 WIN MAC LINUX : scrollbars/custom-scrollbar-with-incomplete-style.html = IMAGE
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d180029..2f1a6e1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-11  Prasad Tammana  <prasadt at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Added support for showModalDialog on chromium port.
+
+        Implement showModalDialog for Layout tests for chromium port
+        https://bugs.webkit.org/show_bug.cgi?id=46759
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::closeWidgetSoon): Quit current message loop if in a modal loop.
+        (WebViewHost::runModal):  Start a nested message loop and remember that.
+        (WebViewHost::WebViewHost):  Initialize m_inModalLoop.
+        * DumpRenderTree/chromium/WebViewHost.h:  Add m_inModalLoop.
+
 2010-10-11  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index cb14393..03167ef 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -635,6 +635,10 @@ void WebViewHost::closeWidgetSoon()
 {
     m_hasWindow = false;
     m_shell->closeWindow(this);
+    if (m_inModalLoop) {
+      m_inModalLoop = false;
+      webkit_support::QuitMessageLoop();
+    }
 }
 
 void WebViewHost::didChangeCursor(const WebCursorInfo& cursorInfo)
@@ -677,7 +681,11 @@ WebRect WebViewHost::windowResizerRect()
 
 void WebViewHost::runModal()
 {
-    // FIXME: Should we implement this in DRT?
+    bool oldState = webkit_support::MessageLoopNestableTasksAllowed();
+    webkit_support::MessageLoopSetNestableTasksAllowed(true);
+    m_inModalLoop = true;
+    webkit_support::RunMessageLoop();
+    webkit_support::MessageLoopSetNestableTasksAllowed(oldState);
 }
 
 // WebFrameClient ------------------------------------------------------------
@@ -1053,6 +1061,7 @@ WebViewHost::WebViewHost(TestShell* shell)
     , m_pageId(-1)
     , m_lastPageIdUpdated(-1)
     , m_hasWindow(false)
+    , m_inModalLoop(false)
     , m_smartInsertDeleteEnabled(true)
 #if OS(WINDOWS)
     , m_selectTrailingWhitespaceEnabled(true)
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
index e2e5684..d60ea76 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
@@ -257,6 +257,7 @@ private:
     WebKit::WebCursorInfo m_currentCursor;
 
     bool m_hasWindow;
+    bool m_inModalLoop;
     WebKit::WebRect m_windowRect;
 
     // true if we want to enable smart insert/delete.

-- 
WebKit Debian packaging