| Index: Source/core/page/Frame.cpp
|
| diff --git a/Source/core/page/Frame.cpp b/Source/core/page/Frame.cpp
|
| index 53e054b06d753d75a05b01637c2ceabc70cf190b..19641ffc8e835a926b4af812434ec71fd4fbd04e 100644
|
| --- a/Source/core/page/Frame.cpp
|
| +++ b/Source/core/page/Frame.cpp
|
| @@ -448,7 +448,7 @@ PassRefPtr<Range> Frame::rangeForPoint(const IntPoint& framePoint)
|
| }
|
|
|
| void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor, bool transparent,
|
| - const IntSize& fixedLayoutSize, bool useFixedLayout, ScrollbarMode horizontalScrollbarMode, bool horizontalLock,
|
| + ScrollbarMode horizontalScrollbarMode, bool horizontalLock,
|
| ScrollbarMode verticalScrollbarMode, bool verticalLock)
|
| {
|
| ASSERT(this);
|
| @@ -464,8 +464,9 @@ void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor
|
| RefPtr<FrameView> frameView;
|
| if (isMainFrame) {
|
| frameView = FrameView::create(this, viewportSize);
|
| - frameView->setFixedLayoutSize(fixedLayoutSize);
|
| - frameView->setUseFixedLayout(useFixedLayout);
|
| +
|
| + // The layout size is set by WebViewImpl to support @viewport
|
| + frameView->setLayoutSizeFixedToFrameSize(false);
|
| } else
|
| frameView = FrameView::create(this);
|
|
|
|
|