[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

aroben at apple.com aroben at apple.com
Fri Jan 21 15:03:56 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit d4bacbe50b7b84cf53c6b5cd5ae11360b5c61288
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 20:47:38 2011 +0000

    Remove WebView::m_rect
    
    It was only used in the constructor, and wasn't even kept up-to-date as
    the WebView's size changed.
    
    Fixes <http://webkit.org/b/52000> WebView::m_rect is unnecessary
    
    Reviewed by Ada Chan.
    
    * UIProcess/win/WebView.cpp:
    * UIProcess/win/WebView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75183 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 79f05af..7be479e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-06  Adam Roben  <aroben at apple.com>
+
+        Remove WebView::m_rect
+
+        It was only used in the constructor, and wasn't even kept up-to-date as
+        the WebView's size changed.
+
+        Fixes <http://webkit.org/b/52000> WebView::m_rect is unnecessary
+
+        Reviewed by Ada Chan.
+
+        * UIProcess/win/WebView.cpp:
+        * UIProcess/win/WebView.h:
+
 2011-01-05  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Ada Chan.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 39f5049..dec28fc 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -221,8 +221,7 @@ bool WebView::registerWebViewWindowClass()
 }
 
 WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND parentWindow)
-    : m_rect(rect)
-    , m_topLevelParentWindow(0)
+    : m_topLevelParentWindow(0)
     , m_toolTipWindow(0)
     , m_lastCursorSet(0)
     , m_webCoreCursor(0)
@@ -239,10 +238,10 @@ WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND p
     m_page->setDrawingArea(ChunkedUpdateDrawingAreaProxy::create(this, m_page.get()));
 
     m_window = ::CreateWindowEx(0, kWebKit2WebViewWindowClassName, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-        m_rect.top, m_rect.left, m_rect.right - m_rect.left, m_rect.bottom - m_rect.top, parentWindow ? parentWindow : HWND_MESSAGE, 0, instanceHandle(), this);
+        rect.top, rect.left, rect.right - rect.left, rect.bottom - rect.top, parentWindow ? parentWindow : HWND_MESSAGE, 0, instanceHandle(), this);
     ASSERT(::IsWindow(m_window));
 
-    m_page->initializeWebPage(IntRect(m_rect).size());
+    m_page->initializeWebPage(IntRect(rect).size());
 
     ::ShowWindow(m_window, SW_SHOW);
 
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 6041476..814fed4 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -46,8 +46,6 @@ public:
     }
     ~WebView();
 
-    RECT rect() const { return m_rect; }
-
     HWND window() const { return m_window; }
     void setParentWindow(HWND);
     void windowAncestryDidChange();
@@ -137,7 +135,6 @@ private:
     // WebCore::WindowMessageListener
     virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
 
-    RECT m_rect;
     HWND m_window;
     HWND m_topLevelParentWindow;
     HWND m_toolTipWindow;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list