Don't send synchronous resize events when FrameView has auto-sizing enabled.

<https://webkit.org/b/130198>
<rdar://problem/15991333>

Reviewed by Dan Bernstein.

* page/FrameView.cpp:
(WebCore::FrameView::sendResizeEventIfNeeded):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4f292b262d71e57c1ea937237d591feb44363051..4cc88ece14cdb831164b09a567f3178a3dbfa87f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-13  Andreas Kling  <akling@apple.com>
+
+        Don't send synchronous resize events when FrameView has auto-sizing enabled.
+        <https://webkit.org/b/130198>
+        <rdar://problem/15991333>
+
+        Reviewed by Dan Bernstein.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::sendResizeEventIfNeeded):
+
 2014-03-13  Antti Koivisto  <antti@apple.com>
 
         Try to fix release build.

diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 31490e794de371fe51031ddace3364534b6eb635..12b56adf97459667e68477640901c9986928a20c 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -2715,7 +2715,7 @@ void FrameView::sendResizeEventIfNeeded()
 #endif
 
     bool isMainFrame = frame().isMainFrame();
-    bool canSendResizeEventSynchronously = isMainFrame && !isInLayout();
+    bool canSendResizeEventSynchronously = !m_shouldAutoSize && isMainFrame && !isInLayout();
 
     // If we resized during layout, queue up a resize event for later, otherwise fire it right away.
     RefPtr<Event> resizeEvent = Event::create(eventNames().resizeEvent, false, false);