Title: [104470] branches/chromium/963/Source/WebKit/chromium/src/WebFrameImpl.cpp
- Revision
- 104470
- Author
- [email protected]
- Date
- 2012-01-09 11:41:42 -0800 (Mon, 09 Jan 2012)
Log Message
Merge 104419 - [chromium] iframes in an autoresized window get sized incorrectly.
https://bugs.webkit.org/show_bug.cgi?id=75806
Reviewed by Adam Barth.
Source/WebKit/chromium:
TEST: fast/autoresize/autoresize-with-iframe.html
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::createFrameView): Only do autoresizing
for the main frame not child frames.
LayoutTests:
* fast/autoresize/autoresize-with-iframe-expected.txt: Added.
* fast/autoresize/autoresize-with-iframe.html: Added.
* fast/autoresize/basic.html: Pulled out autoresize-util.js
* fast/autoresize/resources/autoresize-util.js: Added.
(log):
(shouldBe):
* fast/autoresize/resources/iframe.html: Added.
[email protected]
Review URL: http://codereview.chromium.org/9151009
Modified Paths
Diff
Modified: branches/chromium/963/Source/WebKit/chromium/src/WebFrameImpl.cpp (104469 => 104470)
--- branches/chromium/963/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-01-09 19:26:54 UTC (rev 104469)
+++ branches/chromium/963/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-01-09 19:41:42 UTC (rev 104470)
@@ -2088,7 +2088,7 @@
WebViewImpl* webView = viewImpl();
m_frame->createView(webView->size(), Color::white, webView->isTransparent(), webView->fixedLayoutSize(), webView->isFixedLayoutModeEnabled());
- if (webView->shouldAutoResize())
+ if (webView->shouldAutoResize() && isMainFrame)
m_frame->view()->enableAutoSizeMode(true, webView->minAutoSize(), webView->maxAutoSize());
#if ENABLE(GESTURE_RECOGNIZER)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
