Changeset 84763 in webkit
- Timestamp:
- Apr 24, 2011 4:09:39 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r84762 r84763 1 2011-04-24 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r84759. 4 http://trac.webkit.org/changeset/84759 5 https://bugs.webkit.org/show_bug.cgi?id=59306 6 7 Caused gc-shadow.html to start crashing in V8. (Requested by 8 dglazkov|away on #webkit). 9 10 * fast/dom/shadow/append-child-text-expected.txt: Removed. 11 * fast/dom/shadow/append-child-text.html: Removed. 12 1 13 2011-04-24 Maciej Stachowiak <mjs@apple.com> 2 14 -
trunk/Source/WebCore/ChangeLog
r84762 r84763 1 2011-04-24 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r84759. 4 http://trac.webkit.org/changeset/84759 5 https://bugs.webkit.org/show_bug.cgi?id=59306 6 7 Caused gc-shadow.html to start crashing in V8. (Requested by 8 dglazkov|away on #webkit). 9 10 * dom/Node.cpp: 11 (WebCore::NodeRendererFactory::createRendererAndStyle): 12 (WebCore::Node::styleForRenderer): 13 1 14 2011-04-24 Maciej Stachowiak <mjs@apple.com> 2 15 -
trunk/Source/WebCore/dom/Node.cpp
r84759 r84763 1484 1484 ContainerNode* parentNodeForRenderingAndStyle() const { return m_parentNodeForRenderingAndStyle; } 1485 1485 void createRendererIfNeeded(); 1486 PassRefPtr<RenderStyle> styleForRenderer();1487 1486 1488 1487 private: … … 1498 1497 ShadowRoot* m_visualParentShadowRoot; 1499 1498 }; 1500 1501 PassRefPtr<RenderStyle> NodeRendererFactory::styleForRenderer()1502 {1503 if (m_node->isElementNode()) {1504 bool allowSharing = true;1505 #if ENABLE(XHTMLMP)1506 // noscript needs the display property protected - it's a special case1507 allowSharing = m_node->localName() != HTMLNames::noscriptTag.localName();1508 #endif1509 return m_node->document()->styleSelector()->styleForElement(static_cast<Element*>(m_node), 0, allowSharing);1510 }1511 ContainerNode* parentNodeForStyle = parentNodeForRenderingAndStyle();1512 return parentNodeForStyle && parentNodeForStyle->renderer() ? parentNodeForStyle->renderer()->style() : 0;1513 }1514 1499 1515 1500 ContainerNode* NodeRendererFactory::findVisualParent() … … 1572 1557 return 0; 1573 1558 1574 RefPtr<RenderStyle> style = styleForRenderer();1559 RefPtr<RenderStyle> style = m_node->styleForRenderer(); 1575 1560 if (!m_node->rendererIsNeeded(style.get())) 1576 1561 return 0; … … 1637 1622 PassRefPtr<RenderStyle> Node::styleForRenderer() 1638 1623 { 1639 return NodeRendererFactory(this).styleForRenderer(); 1624 if (isElementNode()) { 1625 bool allowSharing = true; 1626 #if ENABLE(XHTMLMP) 1627 // noscript needs the display property protected - it's a special case 1628 allowSharing = localName() != HTMLNames::noscriptTag.localName(); 1629 #endif 1630 return document()->styleSelector()->styleForElement(static_cast<Element*>(this), 0, allowSharing); 1631 } 1632 return parentNode() && parentNode()->renderer() ? parentNode()->renderer()->style() : 0; 1640 1633 } 1641 1634
Note: See TracChangeset
for help on using the changeset viewer.