From: levin@chromium.org <levin@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 6 Jan 2012 00:32:25 +0000 (+0000)
Subject: [chromium] Resize requests at the view level should be ignored when in autoresize... 
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=87402de106a227c173025c41293127edfc860d3f

[chromium] Resize requests at the view level should be ignored when in autoresize mode.
https://bugs.webkit.org/show_bug.cgi?id=75651

Reviewed by Dmitry Titov.

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::resize): The assert was here to catch a view that
tried to do a resize after setting autoresize. However, we found that generic
code tries to do resizes as well. Rather than special case each caller,
we'll just make this code ignore the resize call.


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104241 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 0ed087e..ec2dac0 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-05  David Levin  <levin@chromium.org>
+
+        [chromium] Resize requests at the view level should be ignored when in autoresize mode.
+        https://bugs.webkit.org/show_bug.cgi?id=75651
+
+        Reviewed by Dmitry Titov.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize): The assert was here to catch a view that
+        tried to do a resize after setting autoresize. However, we found that generic
+        code tries to do resizes as well. Rather than special case each caller,
+        we'll just make this code ignore the resize call.
+
 2012-01-05  W. James MacLean  <wjmaclean@chromium.org>
 
         [chromium][aura] WebExternalTextureLayerImpl::drawsContent() returns incorrect value, causing accelerated content to not display in Aura desktop
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 0457baa..7b12dca 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1046,8 +1046,7 @@ void WebViewImpl::willStartLiveResize()
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
-    ASSERT(!m_shouldAutoResize);
-    if (m_size == newSize)
+    if (m_shouldAutoResize || m_size == newSize)
         return;
     m_size = newSize;