5 files changed, 34 insertions, 14 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt
deleted file mode 100644
index 90a0a2e..0000000
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 9: Uncaught Error: HIERARCHY_REQUEST_ERR: DOM Exception 3
-
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<WebCore::FrameView> 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
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 6d889b0..a0078db 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;
-class WebRect;
+struct WebRect;
 }
 
 struct MenuItem;
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 12ac343..472a77a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2710,3 +2710,31 @@ 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 with wrong expected file. Will fix upstream and enable.
+BUG13305 : LayoutTests/editing/execCommand/list-wrapping-image-crash.html = FAIL
+
+// WebKit 44372:44405
+// Due to change http://trac.webkit.org/changeset/44401 Linux renders scrollbars differently.
+// The following tests failed and need rebaseline.
+BUG13313 LINUX REBASELINE : LayoutTests/fast/css/line-height-overflow.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/flexbox/009.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/frames/invalid.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/frames/valid.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/overflow/unreachable-overflow-rtl-bug.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/svg/hixie/links/003-broken.xml = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/tables/mozilla/bugs/bug113235-1.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/tables/mozilla/core/cell_heights.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/css/line-height-overflow.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/flexbox/009.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/frames/invalid.html = FAIL
+BUG13313 LINUX REBASELINE : LayoutTests/fast/frames/valid.html = FAIL
+  
+// WebKit 44372:44405
+// New Linux crashes.
+BUG13314 LINUX : LayoutTests/css2.1/atrule_longest_match.html = CRASH
+BUG13314 LINUX : LayoutTests/editing/deleting/25322-1.html = CRASH
+BUG13314 LINUX : LayoutTests/platform/mac/accessibility/accesskey.html = CRASH
+BUG13314 LINUX : LayoutTests/svg/W3C-SVG-1.1/animate-elem-02-t.svg = CRASH
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index f1ac224..41acb49 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -2624,8 +2624,6 @@
         '../third_party/WebKit/WebCore/platform/mac/WebCoreObjCExtras.mm',
         '../third_party/WebKit/WebCore/platform/mac/WebCoreSystemInterface.h',
         '../third_party/WebKit/WebCore/platform/mac/WebCoreSystemInterface.mm',
-        '../third_party/WebKit/WebCore/platform/mac/WebCoreTextRenderer.h',
-        '../third_party/WebKit/WebCore/platform/mac/WebCoreTextRenderer.mm',
         '../third_party/WebKit/WebCore/platform/mac/WebCoreView.h',
         '../third_party/WebKit/WebCore/platform/mac/WebCoreView.m',
         '../third_party/WebKit/WebCore/platform/mac/WebFontCache.h',