[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[aroben at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit ca766f78f4fa9635e6aa1c5e4dd8b8090f63bc50
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 06:39:12 2011 +0000

    Small cleanup in MediaPlayerPrivateFullscreenWindow
    
    Reviewed by Sam Weinig.
    
    * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
    (WebCore::MediaPlayerPrivateFullscreenWindow::~MediaPlayerPrivateFullscreenWindow): Moved
    code here from close(), since this was the only place that called it after the following
    change to createWindow.
    (WebCore::MediaPlayerPrivateFullscreenWindow::createWindow): Replaced code that handled the
    case where we had already created the window with an assertion that we have not already done
    so. Our single caller (FullscreenVideoController) did not require this behavior.
    
    * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h: Removed layerView.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8561f1d..879d00e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-26  Adam Roben  <aroben at apple.com>
+
+        Small cleanup in MediaPlayerPrivateFullscreenWindow
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
+        (WebCore::MediaPlayerPrivateFullscreenWindow::~MediaPlayerPrivateFullscreenWindow): Moved
+        code here from close(), since this was the only place that called it after the following
+        change to createWindow.
+        (WebCore::MediaPlayerPrivateFullscreenWindow::createWindow): Replaced code that handled the
+        case where we had already created the window with an assertion that we have not already done
+        so. Our single caller (FullscreenVideoController) did not require this behavior.
+
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h: Removed layerView.
+
 2011-01-26  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
index 01db7f2..c593944 100644
--- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
+++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
@@ -47,8 +47,11 @@ MediaPlayerPrivateFullscreenWindow::MediaPlayerPrivateFullscreenWindow(MediaPlay
 
 MediaPlayerPrivateFullscreenWindow::~MediaPlayerPrivateFullscreenWindow()
 {
-    if (m_hwnd)
-        close();
+    if (!m_hwnd)
+        return;
+
+    ::DestroyWindow(m_hwnd);
+    ASSERT(!m_hwnd);
 }
 
 void MediaPlayerPrivateFullscreenWindow::createWindow(HWND parentHwnd)
@@ -65,8 +68,7 @@ void MediaPlayerPrivateFullscreenWindow::createWindow(HWND parentHwnd)
         windowAtom = ::RegisterClassEx(&wcex);
     }
 
-    if (m_hwnd)
-        close();
+    ASSERT(!m_hwnd);
 
     MONITORINFO mi = {0};
     mi.cbSize = sizeof(MONITORINFO);
@@ -87,12 +89,6 @@ void MediaPlayerPrivateFullscreenWindow::createWindow(HWND parentHwnd)
     ::SetFocus(m_hwnd);
 }
 
-void MediaPlayerPrivateFullscreenWindow::close()
-{
-    ::DestroyWindow(m_hwnd);
-    ASSERT(!m_hwnd);
-}
-
 #if USE(ACCELERATED_COMPOSITING)
 void MediaPlayerPrivateFullscreenWindow::setRootChildLayer(PassRefPtr<PlatformCALayer> rootChild)
 {
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
index c1ae762..7a6d1f5 100644
--- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
+++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
@@ -53,13 +53,10 @@ public:
     ~MediaPlayerPrivateFullscreenWindow();
 
     void createWindow(HWND ownerWindow);
-    void close();
     
     HWND hwnd() const { return m_hwnd; }
 
 #if USE(ACCELERATED_COMPOSITING)
-    CACFLayerTreeHost* layerView() const { return m_layerTreeHost.get(); }
-
     PlatformCALayer* rootChildLayer() const { return m_rootChild.get(); }
     void setRootChildLayer(PassRefPtr<PlatformCALayer>);
 #endif

-- 
WebKit Debian packaging