Changeset 89876 in webkit
- Timestamp:
- Jun 27, 2011 4:26:18 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r89873 r89876 1 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2 3 Reviewed by Simon Fraser. 4 5 Crash on www.crave.cnet.com in FrameView::windowClipRect() 6 https://bugs.webkit.org/show_bug.cgi?id=56393 7 8 Tests that a plugin of a swf file in a hidden iframe will not 9 crash. This test required more than 1 content file and a 10 timeout or else it would not repeat the error condition. 11 12 This test will only crash on platforms (like Symbian) that 13 don't allow nonvirtual functions to have a null this pointer. 14 15 * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added. 16 * plugins/hidden-iframe-with-swf-plugin.html: Added. 17 * plugins/resources/iframe-content-with-swf-plugin.html: Added. 18 1 19 2011-06-27 Adam Barth <abarth@webkit.org> 2 20 -
trunk/Source/WebCore/ChangeLog
r89874 r89876 1 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2 3 Reviewed by Simon Fraser. 4 5 Crash on www.crave.cnet.com in FrameView::windowClipRect() 6 https://bugs.webkit.org/show_bug.cgi?id=56393 7 8 Check for a null renderer to fix a crash. This situation can 9 arise when external content/plugins is referenced from html 10 elements with style="display:none". 11 12 Test: plugins/hidden-iframe-with-swf-plugin.html 13 14 * page/FrameView.cpp: 15 (WebCore::FrameView::windowClipRect): 16 1 17 2011-06-27 Raymes Khoury <raymes@chromium.org> 2 18 -
trunk/Source/WebCore/page/FrameView.cpp
r89754 r89876 2128 2128 // Take our owner element and get the clip rect from the enclosing layer. 2129 2129 Element* elt = m_frame->ownerElement(); 2130 RenderLayer* layer = elt->renderer()->enclosingLayer(); 2131 // FIXME: layer should never be null, but sometimes seems to be anyway. 2130 // The renderer can sometimes be null when style="display:none" interacts 2131 // with external content and plugins. 2132 RenderLayer* layer = elt->renderer() ? elt->renderer()->enclosingLayer() : 0; 2132 2133 if (!layer) 2133 2134 return clipRect;
Note: See TracChangeset
for help on using the changeset viewer.