Revert 17601 (build break on mac)

TBR=ukai
BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17602 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 10 deletions

diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 0d78729..6d71e5a 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -94,7 +94,6 @@ 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"
@@ -185,6 +184,7 @@ 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();
 
-  RefPtr<WebCore::FrameView> view;
+  WebCore::FrameView* view;
   if (is_main_frame) {
     IntSize size = webkit_glue::WebSizeToIntSize(web_view->size());
-    view = FrameView::create(frame_, size);
+    view = new FrameView(frame_, size);
   } else {
-    view = FrameView::create(frame_);
+    view = new FrameView(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.get());
+    frame_->ownerRenderer()->setWidget(view);
 
   if (HTMLFrameOwnerElement* owner = frame_->ownerElement()) {
     view->setCanHaveScrollbars(
@@ -1480,6 +1480,10 @@ 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
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index a0078db..6d889b0 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -27,7 +27,7 @@ namespace WebKit {
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
-struct WebRect;
+class WebRect;
 }
 
 struct MenuItem;
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ee5b4b4..12ac343 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2710,7 +2710,3 @@ BUG13267 LINUX : LayoutTests/fast/overflow/overflow-rtl-inline-scrollbar.html =
 BUG13267 LINUX : LayoutTests/svg/custom/mask-inside-defs.svg = PASS FAIL
 BUG13267 LINUX : LayoutTests/svg/custom/stroked-pattern.svg = PASS FAIL
 BUG13267 LINUX : LayoutTests/editing/selection/5131716-3.html = PASS FAIL
-
-// WebKit change http://trac.webkit.org/changeset/44375
-// added this test. Needs a baseline for Linux
-BUG13305 LINUX : LayoutTests/editing/execCommand/list-wrapping-image-crash.html = FAIL
\ No newline at end of file