Title: [167234] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 167234
- Author
- [email protected]
- Date
- 2014-04-14 03:38:38 -0700 (Mon, 14 Apr 2014)
Log Message
Merge r165548 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167233 => 167234)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 10:26:41 UTC (rev 167233)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 10:38:38 UTC (rev 167234)
@@ -1,3 +1,14 @@
+2014-03-13 Andreas Kling <[email protected]>
+
+ 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-08 Oliver Hunt <[email protected]>
SerializedScriptValue may move Identifiers between worlds
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/page/FrameView.cpp (167233 => 167234)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/page/FrameView.cpp 2014-04-14 10:26:41 UTC (rev 167233)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/page/FrameView.cpp 2014-04-14 10:38:38 UTC (rev 167234)
@@ -2762,7 +2762,7 @@
#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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
