From 64367c0e4aedaaf41f168f3e46aabf034d16d95c Mon Sep 17 00:00:00 2001 From: "dimich@google.com" Date: Thu, 4 Jun 2009 06:56:49 +0000 Subject: WebKit 44372:44405, resubmit. Fixed Mac build (needed to remove a file that was removed upstream). Added expected Linux layout tests failures from the first landing attempt. Removing the chromium-specific snapshot for list-wrapping-image-crash-expected.html test because the test was incorrectly added upstream. Will fix it upstream and then re-enable in Chromium. Original code review: http://codereview.chromium.org/118215 TBR=ukai BUG=13305, 13313, 13314 (layout tests - reenable, rebaseline) TEST=none Review URL: http://codereview.chromium.org/119156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17616 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webframe_impl.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'webkit/glue/webframe_impl.cc') diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 6d71e5a..0d78729 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -94,6 +94,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "GraphicsContext.h" #include "HTMLCollection.h" #include "HTMLHeadElement.h" +#include "HTMLFrameOwnerElement.h" #include "HTMLLinkElement.h" #include "HTMLNames.h" #include "HistoryItem.h" @@ -184,7 +185,6 @@ using WebCore::FrameLoadType; using WebCore::FrameTree; using WebCore::FrameView; using WebCore::HistoryItem; -using WebCore::HTMLFrameElementBase; using WebCore::IntRect; using WebCore::KURL; using WebCore::Node; @@ -1455,12 +1455,12 @@ void WebFrameImpl::CreateFrameView() { WebViewImpl* web_view = GetWebViewImpl(); - WebCore::FrameView* view; + RefPtr view; if (is_main_frame) { IntSize size = webkit_glue::WebSizeToIntSize(web_view->size()); - view = new FrameView(frame_, size); + view = FrameView::create(frame_, size); } else { - view = new FrameView(frame_); + view = FrameView::create(frame_); } frame_->setView(view); @@ -1471,7 +1471,7 @@ void WebFrameImpl::CreateFrameView() { // TODO(darin): The Mac code has a comment about this possibly being // unnecessary. See installInFrame in WebCoreFrameBridge.mm if (frame_->ownerRenderer()) - frame_->ownerRenderer()->setWidget(view); + frame_->ownerRenderer()->setWidget(view.get()); if (HTMLFrameOwnerElement* owner = frame_->ownerElement()) { view->setCanHaveScrollbars( @@ -1480,10 +1480,6 @@ void WebFrameImpl::CreateFrameView() { if (is_main_frame) view->setParentVisible(true); - - // FrameViews are created with a refcount of 1 so it needs releasing after we - // assign it to a RefPtr. - view->deref(); } // static -- cgit v1.1