diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 14 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.h | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
5 files changed, 13 insertions, 11 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "44372", + "webkit_revision": "44405", } 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 new file mode 100644 index 0000000..90a0a2e --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt @@ -0,0 +1,2 @@ +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..ee5b4b4 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2710,3 +2710,7 @@ 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 |