Title: [147770] tags/Safari-537.35.9/Source/WebCore
- Revision
- 147770
- Author
- [email protected]
- Date
- 2013-04-05 11:48:35 -0700 (Fri, 05 Apr 2013)
Log Message
Merged r147664. <rdar://problem/13579024>
Modified Paths
Diff
Modified: tags/Safari-537.35.9/Source/WebCore/ChangeLog (147769 => 147770)
--- tags/Safari-537.35.9/Source/WebCore/ChangeLog 2013-04-05 18:42:21 UTC (rev 147769)
+++ tags/Safari-537.35.9/Source/WebCore/ChangeLog 2013-04-05 18:48:35 UTC (rev 147770)
@@ -1,3 +1,27 @@
+2013-04-05 Lucas Forschler <[email protected]>
+
+ Merge r147664
+
+ 2013-04-04 Tim Horton <[email protected]>
+
+ REGRESSION (r147373): Auto-sizing doesn't always respect minimum width changes
+ https://bugs.webkit.org/show_bug.cgi?id=113947
+ <rdar://problem/13579024>
+
+ Reviewed by Anders Carlsson.
+
+ Reset the FrameView size to the minimum auto-sizing size
+ before performing auto-sizing. We were already resetting the height,
+ but not the width, instead using the FrameView's current width.
+
+ This means that changing the minimum width without also manually
+ resizing the FrameView will never see the width change.
+
+ Auto-sizing tests are not working on Mac yet.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::autoSizeIfEnabled):
+
2013-04-04 Lucas Forschler <[email protected]>
Merge r147579
Modified: tags/Safari-537.35.9/Source/WebCore/page/FrameView.cpp (147769 => 147770)
--- tags/Safari-537.35.9/Source/WebCore/page/FrameView.cpp 2013-04-05 18:42:21 UTC (rev 147769)
+++ tags/Safari-537.35.9/Source/WebCore/page/FrameView.cpp 2013-04-05 18:48:35 UTC (rev 147770)
@@ -2770,8 +2770,8 @@
if (!documentView || !documentElement)
return;
- // Start from the minimum height and allow it to grow.
- resize(frameRect().width(), m_minAutoSize.height());
+ // Start from the minimum size and allow it to grow.
+ resize(m_minAutoSize.width(), m_minAutoSize.height());
IntSize size = frameRect().size();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
