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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ec91320057af9f1a6a6ceb12f6505258bbc748fb
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 19:27:02 2010 +0000

    WebKit2: Focusing Web Inspector window doesn't focus contents on Windows
    https://bugs.webkit.org/show_bug.cgi?id=50947
    <rdar://problem/8762468>
    
    Reviewed by Darin Adler.
    
    When we get the notification that the inspector window has focused, focus the inner inspector view.
    
    * UIProcess/WebInspectorProxy.h:
    * UIProcess/win/WebInspectorProxyWin.cpp:
    (WebKit::WebInspectorProxy::onSetFocusEvent): Set the focus of the inspector view, because that is what
        needs to be focused in the inspector window.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a72d118..18eb39f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-13  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit2: Focusing Web Inspector window doesn't focus contents on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=50947
+        <rdar://problem/8762468>
+        
+        When we get the notification that the inspector window has focused, focus the inner inspector view.
+
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/win/WebInspectorProxyWin.cpp:
+        (WebKit::WebInspectorProxy::onSetFocusEvent): Set the focus of the inspector view, because that is what
+            needs to be focused in the inspector window.
+
 2010-12-13  Dan Bernstein  <mitz at apple.com>
 
         Coding style fix.
diff --git a/WebKit2/UIProcess/WebInspectorProxy.h b/WebKit2/UIProcess/WebInspectorProxy.h
index c0f5619..ecedade 100644
--- a/WebKit2/UIProcess/WebInspectorProxy.h
+++ b/WebKit2/UIProcess/WebInspectorProxy.h
@@ -123,6 +123,7 @@ private:
 
     LRESULT onSizeEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
     LRESULT onMinMaxInfoEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
+    LRESULT onSetFocusEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
     LRESULT onCloseEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled);
 #endif
 
diff --git a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
index 956905a..35dbc45 100644
--- a/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
+++ b/WebKit2/UIProcess/win/WebInspectorProxyWin.cpp
@@ -94,6 +94,9 @@ LRESULT WebInspectorProxy::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
     case WM_GETMINMAXINFO:
         lResult = onMinMaxInfoEvent(hWnd, message, wParam, lParam, handled);
         break;
+    case WM_SETFOCUS:
+        lResult = onSetFocusEvent(hWnd, message, wParam, lParam, handled);
+        break;
     case WM_CLOSE:
         lResult = onCloseEvent(hWnd, message, wParam, lParam, handled);
         break;
@@ -118,6 +121,13 @@ LRESULT WebInspectorProxy::onSizeEvent(HWND, UINT, WPARAM, LPARAM, bool&)
     return 0;
 }
 
+LRESULT WebInspectorProxy::onSetFocusEvent(HWND, UINT, WPARAM, LPARAM lParam, bool&)
+{    
+    ::SetFocus(m_inspectorView->window());
+
+    return 0;
+}
+
 LRESULT WebInspectorProxy::onMinMaxInfoEvent(HWND, UINT, WPARAM, LPARAM lParam, bool&)
 {
     MINMAXINFO* info = reinterpret_cast<MINMAXINFO*>(lParam);

-- 
WebKit Debian packaging