Title: [104241] trunk/Source/WebKit/chromium
Revision
104241
Author
[email protected]
Date
2012-01-05 16:32:25 -0800 (Thu, 05 Jan 2012)

Log Message

[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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (104240 => 104241)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-01-06 00:30:50 UTC (rev 104240)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-01-06 00:32:25 UTC (rev 104241)
@@ -1,3 +1,16 @@
+2012-01-05  David Levin  <[email protected]>
+
+        [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  <[email protected]>
 
         [chromium][aura] WebExternalTextureLayerImpl::drawsContent() returns incorrect value, causing accelerated content to not display in Aura desktop

Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (104240 => 104241)


--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2012-01-06 00:30:50 UTC (rev 104240)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2012-01-06 00:32:25 UTC (rev 104241)
@@ -1046,8 +1046,7 @@
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
-    ASSERT(!m_shouldAutoResize);
-    if (m_size == newSize)
+    if (m_shouldAutoResize || m_size == newSize)
         return;
     m_size = newSize;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to