Changeset 52036 in webkit
- Timestamp:
- Dec 11, 2009 5:50:40 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r52033 r52036 1 2009-12-11 Shinichiro Hamaji <hamaji@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 body with display:inline causes crash 6 https://bugs.webkit.org/show_bug.cgi?id=32371 7 8 * fast/inline/inline-body-crash-expected.txt: Copied from LayoutTests/fast/css-generated-content/absolute-position-inside-inline-expected.txt. 9 * fast/inline/inline-body-crash.html: Added. 10 * fast/inline/inline-body-with-scrollbar-crash-expected.txt: Copied from LayoutTests/fast/css-generated-content/absolute-position-inside-inline-expected.txt. 11 * fast/inline/inline-body-with-scrollbar-crash.html: Added. 12 1 13 2009-12-11 Brady Eidson <beidson@apple.com> 2 14 -
trunk/WebCore/ChangeLog
r52035 r52036 1 2009-12-11 Shinichiro Hamaji <hamaji@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 body with display:inline causes crash 6 https://bugs.webkit.org/show_bug.cgi?id=32371 7 8 Tests: fast/inline/inline-body-crash.html 9 fast/inline/inline-body-with-scrollbar-crash.html 10 11 * page/FrameView.cpp: 12 (WebCore::FrameView::createScrollbar): 13 (WebCore::FrameView::layout): 14 1 15 2009-12-11 Brady Eidson <beidson@apple.com> 2 16 -
trunk/WebCore/page/FrameView.cpp
r52034 r52036 346 346 Element* body = doc ? doc->body() : 0; 347 347 if (body && body->renderer() && body->renderer()->style()->hasPseudoStyle(SCROLLBAR)) 348 return RenderScrollbar::createCustomScrollbar(this, orientation, body->render Box());348 return RenderScrollbar::createCustomScrollbar(this, orientation, body->renderer()->enclosingBox()); 349 349 350 350 // If the <body> didn't have a custom style, then the root element might. … … 605 605 hMode = ScrollbarAlwaysOff; 606 606 } else if (body->hasTagName(bodyTag)) { 607 if (!m_firstLayout && m_size.height() != layoutHeight() 608 && toRenderBox(body->renderer())->stretchesToViewHeight()) 607 if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox()->stretchesToViewHeight()) 609 608 body->renderer()->setChildNeedsLayout(true); 610 609 // It's sufficient to just check the X overflow,
Note: See TracChangeset
for help on using the changeset viewer.