ChangeLog

2011-10-25  Fady Samuel  <fsamuel@chromium.org>

        [Chromium] Refactor WebFrameImpl::createFrameView() to use Frame:createView

        https://bugs.webkit.org/show_bug.cgi?id=70507

        Reviewed by NOBODY (OOPS!).

        No change in functionality except for fixed layout mode. Fixed layout mode has

        not been fully upstreamed yet, so no new tests yet:

        https://bugs.webkit.org/show_bug.cgi?id=70562 will address this.

        This patch also fixes https://bugs.webkit.org/show_bug.cgi?id=70555

        It was decided that fixed layout mode might need to be disabled for some content,

        and so this change enables the embedder to decide whether to enable fixed layout on

        navigation.

        * src/WebFrameImpl.cpp:

        (WebKit::WebFrameImpl::createFrameView):

2011-10-24  Geoffrey Garen  <ggaren@apple.com>

        Removed SharedUChar and tightened language around its previous uses

Source/WebKit/chromium/src/WebFrameImpl.cpp

@@void WebFrameImpl::createFrameView()

{

    ASSERT(m_frame); // If m_frame doesn't exist, we probably didn't init properly.

    Page* page = m_frame->page();

    ASSERT(page);

    ASSERT(page->mainFrame());

    bool isMainFrame = m_frame == page->mainFrame();

    bool useFixedLayout = false;

    IntSize fixedLayoutSize;

    if (isMainFrame && m_frame->view()) {

        m_frame->view()->setParentVisible(false);

        // Save the fixed layout information before destroying the

        // existing FrameView of this frame.

        useFixedLayout = m_frame->view()->useFixedLayout();

        fixedLayoutSize = m_frame->view()->fixedLayoutSize();

    }

    m_frame->setView(0);

20131996 WebViewImpl* webView = viewImpl();

    RefPtr<FrameView> view;

    if (isMainFrame)

        view = FrameView::create(m_frame, webView->size());

    else

        view = FrameView::create(m_frame);

    m_frame->setView(view);

    if (webView->isTransparent())

        view->setTransparent(true);

    // FIXME: The Mac code has a comment about this possibly being unnecessary.

    // See installInFrame in WebCoreFrameBridge.mm

    if (m_frame->ownerRenderer())

        m_frame->ownerRenderer()->setWidget(view.get());

    if (HTMLFrameOwnerElement* owner = m_frame->ownerElement())

        view->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);

    if (isMainFrame)

        view->setParentVisible(true);

1997 m_frame->createView(webView->size(), Color::white, false /* transparent */, webView->fixedLayoutSize(), webView->isFixedLayoutModeEnabled());

#if ENABLE(GESTURE_RECOGNIZER)

    webView->resetGestureRecognizer();

#endif

    // Restore the saved fixed layout information.

    view->setUseFixedLayout(useFixedLayout);

    view->setFixedLayoutSize(fixedLayoutSize);

}

WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame)