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

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 20e357bcfccbd9eb176dd7e881443326ea688985
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 01:58:15 2010 +0000

    WebEditorClient::didBeginEditing is never called in WebKit2
    https://bugs.webkit.org/show_bug.cgi?id=42939
    
    Reviewed by Sam Weinig.
    
    * WebKitTestRunner/PlatformWebView.h:
    Declare focus().
    
    * WebKitTestRunner/TestController.cpp:
    (WTR::TestController::resetStateToConsistentValues):
    Focus the PlatformWebView.
    
    * WebKitTestRunner/mac/PlatformWebViewMac.mm:
    (WTR::PlatformWebView::focus):
    Stubbed.
    
    * WebKitTestRunner/win/PlatformWebViewWin.cpp:
    (WTR::PlatformWebView::focus):
    Focus the view.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2c5c2e4..26a3b17 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,27 @@
 2010-08-15  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        WebEditorClient::didBeginEditing is never called in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=42939
+
+        Reviewed by Sam Weinig.
+
+        * WebKitTestRunner/PlatformWebView.h:
+        Declare focus().
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+        Focus the PlatformWebView.
+
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        (WTR::PlatformWebView::focus):
+        Stubbed.
+
+        * WebKitTestRunner/win/PlatformWebViewWin.cpp:
+        (WTR::PlatformWebView::focus):
+        Focus the view.
+
+2010-08-15  Jon Honeycutt  <jhoneycutt at apple.com>
+
         run-webkit-tests should not strip editing callbacks when using
         WebKitTestRunner on Windows
         https://bugs.webkit.org/show_bug.cgi?id=44000
diff --git a/WebKitTools/WebKitTestRunner/PlatformWebView.h b/WebKitTools/WebKitTestRunner/PlatformWebView.h
index 6fc4509..29c63ae 100644
--- a/WebKitTools/WebKitTestRunner/PlatformWebView.h
+++ b/WebKitTools/WebKitTestRunner/PlatformWebView.h
@@ -51,6 +51,7 @@ public:
     WKPageRef page();
     PlatformWKView platformView() { return m_view; }
     void resizeTo(unsigned width, unsigned height);
+    void focus();
 
 private:
     PlatformWKView m_view;
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index 1443844..a5935d7 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -183,6 +183,8 @@ void TestController::resetStateToConsistentValues()
     WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
     WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
 
+    m_mainWebView->focus();
+
     // Reset main page back to about:blank
     m_doneResetting = false;
 
diff --git a/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm b/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
index 4e2a60c..96e6526 100644
--- a/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
+++ b/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
@@ -58,4 +58,9 @@ WKPageRef PlatformWebView::page()
     return [m_view pageRef];
 }
 
+void PlatformWebView::focus()
+{
+    // Implement.
+}
+
 } // namespace WTR
diff --git a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
index 0f22842..deed4ab 100644
--- a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
@@ -73,4 +73,9 @@ WKPageRef PlatformWebView::page()
     return WKViewGetPage(m_view);
 }
 
+void PlatformWebView::focus()
+{
+    ::SetFocus(::WKViewGetWindow(m_view));
+}
+
 } // namespace WTR

-- 
WebKit Debian packaging