Changeset 154371 in webkit


Ignore:
Timestamp:
Aug 20, 2013 3:52:55 PM (11 years ago)
Author:
Antti Koivisto
Message:

<​https://webkit.org/b/120071> Replace NodeRenderingContext with Node* as childShouldCreateRenderer() argument

Reviewed by Darin Adler.

This simplifies the code. NodeRenderingContext was basically only used for getting the Node.

  • dom/ContainerNode.h:

(WebCore::ContainerNode::childShouldCreateRenderer):

  • dom/Element.cpp:

(WebCore::Element::childShouldCreateRenderer):

  • dom/Element.h:
  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::shouldCreateRenderer):

  • dom/NodeRenderingContext.h:


Move isOnEncapsulationBoundary() to InsertionPoint.h and call it hasShadowRootOrActiveInsertionPointParent().
Move isOnUpperEncapsulationBoundary() to ShadowRoot.h and call it hasShadowRootParent().

  • dom/ShadowRoot.h:

(WebCore::hasShadowRootParent):

  • html/HTMLDetailsElement.cpp:

(WebCore::HTMLDetailsElement::childShouldCreateRenderer):

  • html/HTMLDetailsElement.h:
  • html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::validationMessageShadowTreeContains):

  • html/HTMLFormControlElement.h:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::childShouldCreateRenderer):

  • html/HTMLMediaElement.h:
  • html/HTMLMeterElement.cpp:

(WebCore::HTMLMeterElement::childShouldCreateRenderer):

  • html/HTMLMeterElement.h:
  • html/HTMLOptGroupElement.h:

(WebCore::isHTMLOptGroupElement):

  • html/HTMLOptionElement.h:

(WebCore::isHTMLOptionElement):

  • html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::childShouldCreateRenderer):

  • html/HTMLProgressElement.h:
  • html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::childShouldCreateRenderer):

  • html/HTMLSelectElement.h:
  • html/HTMLSummaryElement.cpp:

(WebCore::HTMLSummaryElement::childShouldCreateRenderer):

  • html/HTMLSummaryElement.h:
  • html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::childShouldCreateRenderer):
(WebCore::enclosingTextFormControl):

  • html/HTMLTextFormControlElement.h:
  • html/ValidationMessage.cpp:

(WebCore::ValidationMessage::shadowTreeContains):

  • html/ValidationMessage.h:
  • html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::rendererIsNeeded):

  • html/shadow/InsertionPoint.h:

(WebCore::isActiveInsertionPoint):

Remove isShadowBoundary() as it was equivalent to isActive().
Remove isLowerEncapsulationBoundary() as it was equivalent to isActiveInsertionPoint().

(WebCore::hasShadowRootOrActiveInsertionPointParent):

Moved and renamed from NodeRenderingContext::isOnEncapsulationBoundary().

  • svg/SVGAElement.cpp:

(WebCore::SVGAElement::childShouldCreateRenderer):

  • svg/SVGAElement.h:
  • svg/SVGAltGlyphElement.cpp:

(WebCore::SVGAltGlyphElement::childShouldCreateRenderer):

  • svg/SVGAltGlyphElement.h:
  • svg/SVGDocument.cpp:

(WebCore::SVGDocument::childShouldCreateRenderer):

  • svg/SVGDocument.h:
  • svg/SVGElement.cpp:

(WebCore::SVGElement::childShouldCreateRenderer):

  • svg/SVGElement.h:
  • svg/SVGFilterElement.cpp:

(WebCore::SVGFilterElement::childShouldCreateRenderer):

  • svg/SVGFilterElement.h:
  • svg/SVGFilterPrimitiveStandardAttributes.h:
  • svg/SVGForeignObjectElement.cpp:

(WebCore::SVGForeignObjectElement::childShouldCreateRenderer):

  • svg/SVGForeignObjectElement.h:
  • svg/SVGSVGElement.h:

(WebCore::toSVGSVGElement):

  • svg/SVGSwitchElement.cpp:

(WebCore::SVGSwitchElement::childShouldCreateRenderer):

  • svg/SVGSwitchElement.h:
  • svg/SVGTRefElement.cpp:

(WebCore::SVGTRefElement::childShouldCreateRenderer):

  • svg/SVGTRefElement.h:
  • svg/SVGTSpanElement.cpp:

(WebCore::SVGTSpanElement::childShouldCreateRenderer):

  • svg/SVGTSpanElement.h:
  • svg/SVGTextElement.cpp:

(WebCore::SVGTextElement::childShouldCreateRenderer):

  • svg/SVGTextElement.h:
  • svg/SVGTextPathElement.cpp:

(WebCore::SVGTextPathElement::childShouldCreateRenderer):

  • svg/SVGTextPathElement.h:
Location:
trunk/Source/WebCore
Files:
63 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r154370 r154371  
     12013-08-20  Antti Koivisto  <antti@apple.com>
     2
     3        <https://webkit.org/b/120071> Replace NodeRenderingContext with Node* as childShouldCreateRenderer() argument
     4
     5        Reviewed by Darin Adler.
     6
     7        This simplifies the code. NodeRenderingContext was basically only used for getting the Node.
     8
     9        * dom/ContainerNode.h:
     10        (WebCore::ContainerNode::childShouldCreateRenderer):
     11        * dom/Element.cpp:
     12        (WebCore::Element::childShouldCreateRenderer):
     13        * dom/Element.h:
     14        * dom/NodeRenderingContext.cpp:
     15        (WebCore::NodeRenderingContext::shouldCreateRenderer):
     16        * dom/NodeRenderingContext.h:
     17       
     18            Move isOnEncapsulationBoundary() to InsertionPoint.h and call it hasShadowRootOrActiveInsertionPointParent().
     19            Move isOnUpperEncapsulationBoundary() to ShadowRoot.h and call it hasShadowRootParent().
     20
     21        * dom/ShadowRoot.h:
     22        (WebCore::hasShadowRootParent):
     23        * html/HTMLDetailsElement.cpp:
     24        (WebCore::HTMLDetailsElement::childShouldCreateRenderer):
     25        * html/HTMLDetailsElement.h:
     26        * html/HTMLFormControlElement.cpp:
     27        (WebCore::HTMLFormControlElement::validationMessageShadowTreeContains):
     28        * html/HTMLFormControlElement.h:
     29        * html/HTMLMediaElement.cpp:
     30        (WebCore::HTMLMediaElement::childShouldCreateRenderer):
     31        * html/HTMLMediaElement.h:
     32        * html/HTMLMeterElement.cpp:
     33        (WebCore::HTMLMeterElement::childShouldCreateRenderer):
     34        * html/HTMLMeterElement.h:
     35        * html/HTMLOptGroupElement.h:
     36        (WebCore::isHTMLOptGroupElement):
     37        * html/HTMLOptionElement.h:
     38        (WebCore::isHTMLOptionElement):
     39        * html/HTMLProgressElement.cpp:
     40        (WebCore::HTMLProgressElement::childShouldCreateRenderer):
     41        * html/HTMLProgressElement.h:
     42        * html/HTMLSelectElement.cpp:
     43        (WebCore::HTMLSelectElement::childShouldCreateRenderer):
     44        * html/HTMLSelectElement.h:
     45        * html/HTMLSummaryElement.cpp:
     46        (WebCore::HTMLSummaryElement::childShouldCreateRenderer):
     47        * html/HTMLSummaryElement.h:
     48        * html/HTMLTextFormControlElement.cpp:
     49        (WebCore::HTMLTextFormControlElement::childShouldCreateRenderer):
     50        (WebCore::enclosingTextFormControl):
     51        * html/HTMLTextFormControlElement.h:
     52        * html/ValidationMessage.cpp:
     53        (WebCore::ValidationMessage::shadowTreeContains):
     54        * html/ValidationMessage.h:
     55        * html/shadow/InsertionPoint.cpp:
     56        (WebCore::InsertionPoint::rendererIsNeeded):
     57        * html/shadow/InsertionPoint.h:
     58        (WebCore::isActiveInsertionPoint):
     59       
     60            Remove isShadowBoundary() as it was equivalent to isActive().
     61            Remove isLowerEncapsulationBoundary() as it was equivalent to isActiveInsertionPoint().
     62
     63        (WebCore::hasShadowRootOrActiveInsertionPointParent):
     64       
     65            Moved and renamed from NodeRenderingContext::isOnEncapsulationBoundary().
     66
     67        * svg/SVGAElement.cpp:
     68        (WebCore::SVGAElement::childShouldCreateRenderer):
     69        * svg/SVGAElement.h:
     70        * svg/SVGAltGlyphElement.cpp:
     71        (WebCore::SVGAltGlyphElement::childShouldCreateRenderer):
     72        * svg/SVGAltGlyphElement.h:
     73        * svg/SVGDocument.cpp:
     74        (WebCore::SVGDocument::childShouldCreateRenderer):
     75        * svg/SVGDocument.h:
     76        * svg/SVGElement.cpp:
     77        (WebCore::SVGElement::childShouldCreateRenderer):
     78        * svg/SVGElement.h:
     79        * svg/SVGFilterElement.cpp:
     80        (WebCore::SVGFilterElement::childShouldCreateRenderer):
     81        * svg/SVGFilterElement.h:
     82        * svg/SVGFilterPrimitiveStandardAttributes.h:
     83        * svg/SVGForeignObjectElement.cpp:
     84        (WebCore::SVGForeignObjectElement::childShouldCreateRenderer):
     85        * svg/SVGForeignObjectElement.h:
     86        * svg/SVGSVGElement.h:
     87        (WebCore::toSVGSVGElement):
     88        * svg/SVGSwitchElement.cpp:
     89        (WebCore::SVGSwitchElement::childShouldCreateRenderer):
     90        * svg/SVGSwitchElement.h:
     91        * svg/SVGTRefElement.cpp:
     92        (WebCore::SVGTRefElement::childShouldCreateRenderer):
     93        * svg/SVGTRefElement.h:
     94        * svg/SVGTSpanElement.cpp:
     95        (WebCore::SVGTSpanElement::childShouldCreateRenderer):
     96        * svg/SVGTSpanElement.h:
     97        * svg/SVGTextElement.cpp:
     98        (WebCore::SVGTextElement::childShouldCreateRenderer):
     99        * svg/SVGTextElement.h:
     100        * svg/SVGTextPathElement.cpp:
     101        (WebCore::SVGTextPathElement::childShouldCreateRenderer):
     102        * svg/SVGTextPathElement.h:
     103
    11042013-08-20  Benjamin Poulain  <benjamin@webkit.org>
    2105

  • trunk/Source/WebCore/dom/CharacterData.cpp

    r154286 r154371  
    3131#include "MutationObserverInterestGroup.h"
    3232#include "MutationRecord.h"
    33 #include "NodeRenderingContext.h"
    3433#include "RenderText.h"
    3534#include "StyleInheritedData.h"

  • trunk/Source/WebCore/dom/ContainerNode.h

    r154365 r154371  
    119119    void disconnectDescendantFrames();
    120120
    121     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const { return true; }
     121    virtual bool childShouldCreateRenderer(const Node*) const { return true; }
    122122
    123123protected:

  • trunk/Source/WebCore/dom/Element.cpp

    r154365 r154371  
    7171#include "NodeList.h"
    7272#include "NodeRenderStyle.h"
    73 #include "NodeRenderingContext.h"
    7473#include "Page.h"
    7574#include "PointerLockController.h"
    … …  
    25012500   
    25022501#if ENABLE(SVG)
    2503 bool Element::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     2502bool Element::childShouldCreateRenderer(const Node* child) const
    25042503{
    25052504    // Only create renderers for SVG elements whose parents are SVG elements, or for proper <svg xmlns="svgNS"> subdocuments.
    2506     if (childContext.node()->isSVGElement())
    2507         return childContext.node()->hasTagName(SVGNames::svgTag) || isSVGElement();
    2508 
    2509     return ContainerNode::childShouldCreateRenderer(childContext);
     2505    if (child->isSVGElement())
     2506        return child->hasTagName(SVGNames::svgTag) || isSVGElement();
     2507
     2508    return ContainerNode::childShouldCreateRenderer(child);
    25102509}
    25112510#endif

  • trunk/Source/WebCore/dom/Element.h

    r154365 r154371  
    482482
    483483#if ENABLE(SVG)
    484     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     484    virtual bool childShouldCreateRenderer(const Node*) const;
    485485    bool hasPendingResources() const;
    486486    void setHasPendingResources();

  • trunk/Source/WebCore/dom/Node.h

    r154254 r154371  
    7171class NodeListsNodeData;
    7272class NodeRareData;
    73 class NodeRenderingContext;
    7473class PlatformKeyboardEvent;
    7574class PlatformMouseEvent;

  • trunk/Source/WebCore/dom/NodeRenderingContext.cpp

    r154365 r154371  
    191191    if (!parentRenderer->canHaveChildren() && !(m_node->isPseudoElement() && parentRenderer->canHaveGeneratedChildren()))
    192192        return false;
    193     if (!m_renderingParent->childShouldCreateRenderer(*this))
     193    if (!m_renderingParent->childShouldCreateRenderer(m_node))
    194194        return false;
    195195    return true;
    … …  
    236236}
    237237
    238 bool NodeRenderingContext::isOnEncapsulationBoundary() const
    239 {
    240     return isOnUpperEncapsulationBoundary()
    241         || isLowerEncapsulationBoundary(findInsertionPointOf(m_node))
    242         || isLowerEncapsulationBoundary(m_node->parentNode());
    243 }
    244 
    245 bool NodeRenderingContext::isOnUpperEncapsulationBoundary() const
    246 {
    247     return m_node->parentNode() && m_node->parentNode()->isShadowRoot();
    248 }
    249 
    250238void NodeRenderingContext::createRendererForElementIfNeeded()
    251239{

  • trunk/Source/WebCore/dom/NodeRenderingContext.h

    r154365 r154371  
    6363    const RenderStyle* style() const;
    6464
    65     bool isOnUpperEncapsulationBoundary() const;
    66     bool isOnEncapsulationBoundary() const;
    67 
    6865private:
    6966    bool shouldCreateRenderer() const;

  • trunk/Source/WebCore/dom/PseudoElement.cpp

    r154358 r154371  
    3030#include "ContentData.h"
    3131#include "InspectorInstrumentation.h"
    32 #include "NodeRenderingContext.h"
    3332#include "RenderObject.h"
    3433#include "RenderQuote.h"

  • trunk/Source/WebCore/dom/ShadowRoot.h

    r154365 r154371  
    136136}
    137137
     138inline bool hasShadowRootParent(const Node* node)
     139{
     140    return node->parentNode() && node->parentNode()->isShadowRoot();
     141}
     142
    138143} // namespace
    139144

  • trunk/Source/WebCore/dom/Text.h

    r154240 r154371  
    2929namespace WebCore {
    3030
     31class NodeRenderingContext;
    3132class RenderText;
    3233

  • trunk/Source/WebCore/html/HTMLDetailsElement.cpp

    r154365 r154371  
    2828#include "LocalizedStrings.h"
    2929#include "MouseEvent.h"
    30 #include "NodeRenderingContext.h"
    3130#include "RenderBlock.h"
    3231#include "ShadowRoot.h"
    … …  
    145144}
    146145
    147 bool HTMLDetailsElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     146bool HTMLDetailsElement::childShouldCreateRenderer(const Node* child) const
    148147{
    149     if (childContext.node()->isPseudoElement())
    150         return HTMLElement::childShouldCreateRenderer(childContext);
     148    if (child->isPseudoElement())
     149        return HTMLElement::childShouldCreateRenderer(child);
    151150
    152     if (!childContext.isOnEncapsulationBoundary())
     151    if (!hasShadowRootOrActiveInsertionPointParent(child))
    153152        return false;
    154153
    155154    if (m_isOpen)
    156         return HTMLElement::childShouldCreateRenderer(childContext);
     155        return HTMLElement::childShouldCreateRenderer(child);
    157156
    158     if (!childContext.node()->hasTagName(summaryTag))
     157    if (!child->hasTagName(summaryTag))
    159158        return false;
    160159
    161     return childContext.node() == findMainSummary() && HTMLElement::childShouldCreateRenderer(childContext);
     160    return child == findMainSummary() && HTMLElement::childShouldCreateRenderer(child);
    162161}
    163162

  • trunk/Source/WebCore/html/HTMLDetailsElement.h

    r154365 r154371  
    3737
    3838    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    39     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     39    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    4040    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
    4141

  • trunk/Source/WebCore/html/HTMLFormControlElement.cpp

    r154365 r154371  
    453453}
    454454
    455 bool HTMLFormControlElement::validationMessageShadowTreeContains(Node* node) const
     455bool HTMLFormControlElement::validationMessageShadowTreeContains(const Node* node) const
    456456{
    457457    return m_validationMessage && m_validationMessage->shadowTreeContains(node);

  • trunk/Source/WebCore/html/HTMLFormControlElement.h

    r154365 r154371  
    129129    virtual bool recalcWillValidate() const;
    130130
    131     bool validationMessageShadowTreeContains(Node*) const;
     131    bool validationMessageShadowTreeContains(const Node*) const;
    132132
    133133private:

  • trunk/Source/WebCore/html/HTMLFormElement.cpp

    r154358 r154371  
    4242#include "HTMLNames.h"
    4343#include "HTMLTableElement.h"
    44 #include "NodeRenderingContext.h"
    4544#include "Page.h"
    4645#include "RenderTextControl.h"

  • trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

    r154358 r154371  
    3636#include "Length.h"
    3737#include "MouseEvent.h"
    38 #include "NodeRenderingContext.h"
    3938#include "RenderFrameSet.h"
    4039#include "ScriptEventListener.h"

  • trunk/Source/WebCore/html/HTMLIFrameElement.cpp

    r154358 r154371  
    3131#include "HTMLDocument.h"
    3232#include "HTMLNames.h"
    33 #include "NodeRenderingContext.h"
    3433#include "RenderIFrame.h"
    3534#include "ScriptableDocumentParser.h"

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r154365 r154371  
    6868#include "MouseEvent.h"
    6969#include "MIMETypeRegistry.h"
    70 #include "NodeRenderingContext.h"
    7170#include "Page.h"
    7271#include "PageActivityAssertionToken.h"
    … …  
    577576}
    578577
    579 bool HTMLMediaElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     578bool HTMLMediaElement::childShouldCreateRenderer(const Node* child) const
    580579{
    581580    if (!hasMediaControls())
    … …  
    585584    // One exception is a shadow tree built for rendering controls which should be visible.
    586585    // So we let them go here by comparing its subtree root with one of the controls.
    587     return (mediaControls()->treeScope() == childContext.node()->treeScope()
    588             && childContext.isOnUpperEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext));
     586    return mediaControls()->treeScope() == child->treeScope()
     587        && hasShadowRootParent(child)
     588        && HTMLElement::childShouldCreateRenderer(child);
    589589}
    590590

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r154365 r154371  
    435435    virtual bool rendererIsNeeded(const RenderStyle&);
    436436    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    437     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     437    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    438438    virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
    439439    virtual void removedFrom(ContainerNode*) OVERRIDE;

  • trunk/Source/WebCore/html/HTMLMeterElement.cpp

    r154365 r154371  
    2727#include "ExceptionCode.h"
    2828#include "FormDataList.h"
    29 #include "NodeRenderingContext.h"
    3029#include "HTMLFormElement.h"
    3130#include "HTMLNames.h"
    … …  
    6665}
    6766
    68 bool HTMLMeterElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
    69 {
    70     return childContext.isOnUpperEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext);
     67bool HTMLMeterElement::childShouldCreateRenderer(const Node* child) const
     68{
     69    return hasShadowRootParent(child) && HTMLElement::childShouldCreateRenderer(child);
    7170}
    7271

  • trunk/Source/WebCore/html/HTMLMeterElement.h

    r154365 r154371  
    7474    virtual bool recalcWillValidate() const { return false; }
    7575    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    76     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     76    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    7777    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
    7878

  • trunk/Source/WebCore/html/HTMLOptGroupElement.cpp

    r154254 r154371  
    3131#include "RenderMenuList.h"
    3232#include "NodeRenderStyle.h"
    33 #include "NodeRenderingContext.h"
    3433#include "StyleResolver.h"
    3534#include <wtf/StdLibExtras.h>

  • trunk/Source/WebCore/html/HTMLOptGroupElement.h

    r154365 r154371  
    6464};
    6565
    66 inline bool isHTMLOptGroupElement(Node* node)
     66inline bool isHTMLOptGroupElement(const Node* node)
    6767{
    6868    return node->hasTagName(HTMLNames::optgroupTag);
    6969}
    7070
    71 inline bool isHTMLOptGroupElement(Element* element)
     71inline bool isHTMLOptGroupElement(const Element* element)
    7272{
    7373    return element->hasTagName(HTMLNames::optgroupTag);

  • trunk/Source/WebCore/html/HTMLOptionElement.cpp

    r154254 r154371  
    3737#include "HTMLSelectElement.h"
    3838#include "NodeRenderStyle.h"
    39 #include "NodeRenderingContext.h"
    4039#include "NodeTraversal.h"
    4140#include "RenderMenuList.h"

  • trunk/Source/WebCore/html/HTMLOptionElement.h

    r154365 r154371  
    9696};
    9797
    98 inline bool isHTMLOptionElement(Node* node)
     98inline bool isHTMLOptionElement(const Node* node)
    9999{
    100100    return node->hasTagName(HTMLNames::optionTag);
    101101}
    102102
    103 inline bool isHTMLOptionElement(Element* element)
     103inline bool isHTMLOptionElement(const Element* element)
    104104{
    105105    return element->hasTagName(HTMLNames::optionTag);

  • trunk/Source/WebCore/html/HTMLProgressElement.cpp

    r154365 r154371  
    2929#include "HTMLNames.h"
    3030#include "HTMLParserIdioms.h"
    31 #include "NodeRenderingContext.h"
    3231#include "ProgressShadowElement.h"
    3332#include "RenderProgress.h"
    … …  
    6867}
    6968
    70 bool HTMLProgressElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     69bool HTMLProgressElement::childShouldCreateRenderer(const Node* child) const
    7170{
    72     return childContext.isOnUpperEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext);
     71    return hasShadowRootParent(child) && HTMLElement::childShouldCreateRenderer(child);
    7372}
    7473

  • trunk/Source/WebCore/html/HTMLProgressElement.h

    r154365 r154371  
    5656
    5757    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    58     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     58    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    5959    RenderProgress* renderProgress() const;
    6060

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r154365 r154371  
    4848#include "LocalizedStrings.h"
    4949#include "MouseEvent.h"
    50 #include "NodeRenderingContext.h"
    5150#include "Page.h"
    5251#include "PlatformMouseEvent.h"
    … …  
    346345}
    347346
    348 bool HTMLSelectElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
    349 {
    350     if (!HTMLFormControlElementWithState::childShouldCreateRenderer(childContext))
     347bool HTMLSelectElement::childShouldCreateRenderer(const Node* child) const
     348{
     349    if (!HTMLFormControlElementWithState::childShouldCreateRenderer(child))
    351350        return false;
    352351    if (!usesMenuList())
    353         return isHTMLOptionElement(childContext.node()) || isHTMLOptGroupElement(childContext.node()) || validationMessageShadowTreeContains(childContext.node());
    354     return validationMessageShadowTreeContains(childContext.node());
     352        return isHTMLOptionElement(child) || isHTMLOptGroupElement(child) || validationMessageShadowTreeContains(child);
     353    return validationMessageShadowTreeContains(child);
    355354}
    356355

  • trunk/Source/WebCore/html/HTMLSelectElement.h

    r154365 r154371  
    129129    virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
    130130
    131     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     131    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    132132    virtual RenderObject* createRenderer(RenderArena*, RenderStyle *);
    133133    virtual bool appendFormData(FormDataList&, bool);

  • trunk/Source/WebCore/html/HTMLSummaryElement.cpp

    r154365 r154371  
    2929#include "KeyboardEvent.h"
    3030#include "MouseEvent.h"
    31 #include "NodeRenderingContext.h"
    3231#include "PlatformMouseEvent.h"
    3332#include "RenderBlock.h"
    … …  
    7271}
    7372
    74 bool HTMLSummaryElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     73bool HTMLSummaryElement::childShouldCreateRenderer(const Node* child) const
    7574{
    76     if (childContext.node()->isPseudoElement())
    77         return HTMLElement::childShouldCreateRenderer(childContext);
     75    if (child->isPseudoElement())
     76        return HTMLElement::childShouldCreateRenderer(child);
    7877
    79     return childContext.isOnEncapsulationBoundary() && HTMLElement::childShouldCreateRenderer(childContext);
     78    return hasShadowRootOrActiveInsertionPointParent(child) && HTMLElement::childShouldCreateRenderer(child);
    8079}
    8180

  • trunk/Source/WebCore/html/HTMLSummaryElement.h

    r154365 r154371  
    3838
    3939    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    40     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     40    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    4141    virtual void defaultEventHandler(Event*);
    4242

  • trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

    r154365 r154371  
    3939#include "HTMLInputElement.h"
    4040#include "HTMLNames.h"
    41 #include "NodeRenderingContext.h"
    4241#include "NodeTraversal.h"
    4342#include "RenderBox.h"
    … …  
    4544#include "RenderTheme.h"
    4645#include "ScriptEventListener.h"
     46#include "ShadowRoot.h"
    4747#include "Text.h"
    4848#include "TextIterator.h"
    … …  
    6767}
    6868
    69 bool HTMLTextFormControlElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     69bool HTMLTextFormControlElement::childShouldCreateRenderer(const Node* child) const
    7070{
    7171    // FIXME: We shouldn't force the pseudo elements down into the shadow, but
    7272    // this perserves the current behavior of WebKit.
    73     if (childContext.node()->isPseudoElement())
    74         return HTMLFormControlElementWithState::childShouldCreateRenderer(childContext);
    75     return childContext.isOnEncapsulationBoundary() && HTMLFormControlElementWithState::childShouldCreateRenderer(childContext);
     73    if (child->isPseudoElement())
     74        return HTMLFormControlElementWithState::childShouldCreateRenderer(child);
     75    return hasShadowRootParent(child) && HTMLFormControlElementWithState::childShouldCreateRenderer(child);
    7676}
    7777
    … …  
    627627    ASSERT(position.isNull() || position.anchorType() == Position::PositionIsOffsetInAnchor
    628628        || position.containerNode() || !position.anchorNode()->shadowHost()
    629         || (position.anchorNode()->parentNode() && position.anchorNode()->parentNode()->isShadowRoot()));
     629        || hasShadowRootParent(position.anchorNode()));
    630630       
    631631    Node* container = position.containerNode();

  • trunk/Source/WebCore/html/HTMLTextFormControlElement.h

    r154365 r154371  
    119119    virtual void dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection) OVERRIDE FINAL;
    120120    virtual void dispatchBlurEvent(PassRefPtr<Element> newFocusedElement) OVERRIDE FINAL;
    121     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     121    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    122122
    123123    // Returns true if user-editable value is empty. Used to check placeholder visibility.

  • trunk/Source/WebCore/html/ValidationMessage.cpp

    r154365 r154371  
    227227}
    228228
    229 bool ValidationMessage::shadowTreeContains(Node* node) const
     229bool ValidationMessage::shadowTreeContains(const Node* node) const
    230230{
    231231    if (validationMessageClient() || !m_bubble)

  • trunk/Source/WebCore/html/ValidationMessage.h

    r154365 r154371  
    5555    void requestToHideMessage();
    5656    bool isVisible() const;
    57     bool shadowTreeContains(Node*) const;
     57    bool shadowTreeContains(const Node*) const;
    5858
    5959private:

  • trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

    r154365 r154371  
    8989}
    9090
    91 bool InsertionPoint::isShadowBoundary() const
    92 {
    93     return treeScope()->rootNode()->isShadowRoot() && isActive();
    94 }
    95 
    9691bool InsertionPoint::isActive() const
    9792{
    … …  
    110105bool InsertionPoint::rendererIsNeeded(const RenderStyle& style)
    111106{
    112     return !isShadowBoundary() && HTMLElement::rendererIsNeeded(style);
     107    return !isActive() && HTMLElement::rendererIsNeeded(style);
    113108}
    114109

  • trunk/Source/WebCore/html/shadow/InsertionPoint.h

    r154365 r154371  
    5757    void setHasDistribution() { m_hasDistribution = true; }
    5858    void clearDistribution() { m_hasDistribution = false; }
    59     bool isShadowBoundary() const;
    6059    bool isActive() const;
    6160
    … …  
    10099inline bool isActiveInsertionPoint(const Node* node)
    101100{
    102     return node->isInsertionPoint() && toInsertionPoint(node)->isActive();
    103 }
    104 
    105 inline bool isLowerEncapsulationBoundary(Node* node)
    106 {
    107     if (!node || !node->isInsertionPoint())
    108         return false;
    109     return toInsertionPoint(node)->isShadowBoundary();
     101    return node && node->isInsertionPoint() && toInsertionPoint(node)->isActive();
    110102}
    111103
    … …  
    144136InsertionPoint* findInsertionPointOf(const Node*);
    145137
     138inline bool hasShadowRootOrActiveInsertionPointParent(const Node* node)
     139{
     140    return hasShadowRootParent(node)
     141        || isActiveInsertionPoint(findInsertionPointOf(node))
     142        || isActiveInsertionPoint(node->parentNode());
     143}
     144
    146145} // namespace WebCore
    147146

  • trunk/Source/WebCore/svg/SVGAElement.cpp

    r154365 r154371  
    3838#include "KeyboardEvent.h"
    3939#include "MouseEvent.h"
    40 #include "NodeRenderingContext.h"
    4140#include "PlatformMouseEvent.h"
    4241#include "RenderSVGInline.h"
    … …  
    225224}
    226225
    227 bool SVGAElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     226bool SVGAElement::childShouldCreateRenderer(const Node* child) const
    228227{
    229228    // http://www.w3.org/2003/01/REC-SVG11-20030114-errata#linking-text-environment
    230229    // The 'a' element may contain any element that its parent may contain, except itself.
    231     if (childContext.node()->hasTagName(SVGNames::aTag))
     230    if (child->hasTagName(SVGNames::aTag))
    232231        return false;
    233232    if (parentNode() && parentNode()->isSVGElement())
    234         return parentNode()->childShouldCreateRenderer(childContext);
    235 
    236     return SVGElement::childShouldCreateRenderer(childContext);
     233        return parentNode()->childShouldCreateRenderer(child);
     234
     235    return SVGElement::childShouldCreateRenderer(child);
    237236}
    238237

  • trunk/Source/WebCore/svg/SVGAElement.h

    r154365 r154371  
    5959    virtual bool isURLAttribute(const Attribute&) const;
    6060
    61     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     61    virtual bool childShouldCreateRenderer(const Node*) const;
    6262
    6363    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAElement)

  • trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp

    r154365 r154371  
    2727
    2828#include "ExceptionCode.h"
    29 #include "NodeRenderingContext.h"
    3029#include "RenderInline.h"
    3130#include "RenderSVGTSpan.h"
    … …  
    7776}
    7877
    79 bool SVGAltGlyphElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     78bool SVGAltGlyphElement::childShouldCreateRenderer(const Node* child) const
    8079{
    81     if (childContext.node()->isTextNode())
     80    if (child->isTextNode())
    8281        return true;
    8382    return false;

  • trunk/Source/WebCore/svg/SVGAltGlyphElement.h

    r154365 r154371  
    4848
    4949    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    50     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     50    virtual bool childShouldCreateRenderer(const Node*) const;
    5151
    5252    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAltGlyphElement)

  • trunk/Source/WebCore/svg/SVGDocument.cpp

    r154365 r154371  
    2626#include "ExceptionCode.h"
    2727#include "FrameView.h"
    28 #include "NodeRenderingContext.h"
    2928#include "RenderView.h"
    3029#include "SVGElement.h"
    … …  
    9594}
    9695
    97 bool SVGDocument::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     96bool SVGDocument::childShouldCreateRenderer(const Node* child) const
    9897{
    99     if (childContext.node()->hasTagName(SVGNames::svgTag))
    100         return toSVGSVGElement(childContext.node())->isValid();
     98    if (child->hasTagName(SVGNames::svgTag))
     99        return toSVGSVGElement(child)->isValid();
    101100    return true;
    102101}

  • trunk/Source/WebCore/svg/SVGDocument.h

    r154365 r154371  
    5252    SVGDocument(Frame*, const KURL&);
    5353
    54     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     54    virtual bool childShouldCreateRenderer(const Node*) const;
    5555
    5656    FloatPoint m_translate;

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r154365 r154371  
    3232#include "Event.h"
    3333#include "HTMLNames.h"
    34 #include "NodeRenderingContext.h"
    3534#include "RenderObject.h"
    3635#include "SVGCursorElement.h"
    … …  
    523522}
    524523
    525 bool SVGElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     524bool SVGElement::childShouldCreateRenderer(const Node* child) const
    526525{
    527526    DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, invalidTextContent, ());
    … …  
    535534        invalidTextContent.add(SVGNames::tspanTag);
    536535    }
    537     if (childContext.node()->isSVGElement()) {
    538         SVGElement* svgChild = toSVGElement(childContext.node());
     536    if (child->isSVGElement()) {
     537        const SVGElement* svgChild = toSVGElement(child);
    539538        if (invalidTextContent.contains(svgChild->tagQName()))
    540539            return false;

  • trunk/Source/WebCore/svg/SVGElement.h

    r154365 r154371  
    132132    virtual void finishParsingChildren();
    133133    virtual void attributeChanged(const QualifiedName&, const AtomicString&, AttributeModificationReason = ModifiedDirectly) OVERRIDE;
    134     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     134    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    135135   
    136136    virtual void removedFrom(ContainerNode*) OVERRIDE;

  • trunk/Source/WebCore/svg/SVGFilterElement.cpp

    r154365 r154371  
    2828
    2929#include "Attr.h"
    30 #include "NodeRenderingContext.h"
    3130#include "RenderSVGResourceFilter.h"
    3231#include "SVGElementInstance.h"
    … …  
    195194}
    196195
    197 bool SVGFilterElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
    198 {
    199     if (!childContext.node()->isSVGElement())
     196bool SVGFilterElement::childShouldCreateRenderer(const Node* child) const
     197{
     198    if (!child->isSVGElement())
    200199        return false;
    201200
    202     SVGElement* svgElement = toSVGElement(childContext.node());
     201    const SVGElement* svgElement = toSVGElement(child);
    203202
    204203    DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, allowedChildElementTags, ());

  • trunk/Source/WebCore/svg/SVGFilterElement.h

    r154365 r154371  
    5656
    5757    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
    58     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE;
     58    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE;
    5959
    6060    virtual bool selfHasRelativeLengths() const;

  • trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h

    r154365 r154371  
    7171    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
    7272    virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE;
    73     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const OVERRIDE { return false; }
     73    virtual bool childShouldCreateRenderer(const Node*) const OVERRIDE { return false; }
    7474
    7575    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)

  • trunk/Source/WebCore/svg/SVGForeignObjectElement.cpp

    r154365 r154371  
    2626#include "Attribute.h"
    2727#include "CSSPropertyNames.h"
    28 #include "NodeRenderingContext.h"
    2928#include "RenderSVGForeignObject.h"
    3029#include "RenderSVGResource.h"
    … …  
    133132}
    134133
    135 bool SVGForeignObjectElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     134bool SVGForeignObjectElement::childShouldCreateRenderer(const Node* child) const
    136135{
    137136    // Disallow arbitary SVG content. Only allow proper <svg xmlns="svgNS"> subdocuments.
    138     if (childContext.node()->isSVGElement())
    139         return childContext.node()->hasTagName(SVGNames::svgTag);
     137    if (child->isSVGElement())
     138        return child->hasTagName(SVGNames::svgTag);
    140139
    141140    // Skip over SVG rules which disallow non-SVG kids
    142     return StyledElement::childShouldCreateRenderer(childContext);
     141    return StyledElement::childShouldCreateRenderer(child);
    143142}
    144143

  • trunk/Source/WebCore/svg/SVGForeignObjectElement.h

    r154365 r154371  
    4444
    4545    virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE;
    46     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     46    virtual bool childShouldCreateRenderer(const Node*) const;
    4747    virtual RenderObject* createRenderer(RenderArena* arena, RenderStyle* style);
    4848

  • trunk/Source/WebCore/svg/SVGSVGElement.h

    r154365 r154371  
    193193}
    194194
     195inline const SVGSVGElement* toSVGSVGElement(const Node* node)
     196{
     197    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isSVGElement());
     198    ASSERT_WITH_SECURITY_IMPLICATION(!node || toSVGElement(node)->isSVGSVGElement());
     199    return static_cast<const SVGSVGElement*>(node);
     200}
     201
    195202} // namespace WebCore
    196203

  • trunk/Source/WebCore/svg/SVGSwitchElement.cpp

    r154365 r154371  
    2424#include "SVGSwitchElement.h"
    2525
    26 #include "NodeRenderingContext.h"
    2726#include "RenderSVGTransformableContainer.h"
    2827#include "SVGNames.h"
    … …  
    5049}
    5150
    52 bool SVGSwitchElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     51bool SVGSwitchElement::childShouldCreateRenderer(const Node* child) const
    5352{
    5453    // FIXME: This function does not do what the comment below implies it does.
    … …  
    6261            continue;
    6362
    64         return node == childContext.node(); // Only allow this child if it's the first valid child
     63        return node == child; // Only allow this child if it's the first valid child
    6564    }
    6665

  • trunk/Source/WebCore/svg/SVGSwitchElement.h

    r154365 r154371  
    4040    virtual bool supportsFocus() const OVERRIDE { return true; }
    4141
    42     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     42    virtual bool childShouldCreateRenderer(const Node*) const;
    4343
    4444    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);

  • trunk/Source/WebCore/svg/SVGTRefElement.cpp

    r154365 r154371  
    2929#include "ExceptionCodePlaceholder.h"
    3030#include "MutationEvent.h"
    31 #include "NodeRenderingContext.h"
    3231#include "RenderSVGInline.h"
    3332#include "RenderSVGInlineText.h"
    … …  
    227226}
    228227
    229 bool SVGTRefElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
    230 {
    231     return childContext.node()->isInShadowTree();
     228bool SVGTRefElement::childShouldCreateRenderer(const Node* child) const
     229{
     230    return child->isInShadowTree();
    232231}
    233232

  • trunk/Source/WebCore/svg/SVGTRefElement.h

    r154365 r154371  
    4646
    4747    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    48     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     48    virtual bool childShouldCreateRenderer(const Node*) const;
    4949    virtual bool rendererIsNeeded(const RenderStyle&);
    5050

  • trunk/Source/WebCore/svg/SVGTSpanElement.cpp

    r154365 r154371  
    2424#include "SVGTSpanElement.h"
    2525
    26 #include "NodeRenderingContext.h"
    2726#include "RenderInline.h"
    2827#include "RenderSVGTSpan.h"
    … …  
    4746}
    4847
    49 bool SVGTSpanElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     48bool SVGTSpanElement::childShouldCreateRenderer(const Node* child) const
    5049{
    51     if (childContext.node()->isTextNode()
    52         || childContext.node()->hasTagName(SVGNames::aTag)
     50    if (child->isTextNode()
     51        || child->hasTagName(SVGNames::aTag)
    5352#if ENABLE(SVG_FONTS)
    54         || childContext.node()->hasTagName(SVGNames::altGlyphTag)
     53        || child->hasTagName(SVGNames::altGlyphTag)
    5554#endif
    56         || childContext.node()->hasTagName(SVGNames::trefTag)
    57         || childContext.node()->hasTagName(SVGNames::tspanTag))
     55        || child->hasTagName(SVGNames::trefTag)
     56        || child->hasTagName(SVGNames::tspanTag))
    5857        return true;
    5958

  • trunk/Source/WebCore/svg/SVGTSpanElement.h

    r154365 r154371  
    3535           
    3636    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    37     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     37    virtual bool childShouldCreateRenderer(const Node*) const;
    3838    virtual bool rendererIsNeeded(const RenderStyle&);
    3939};

  • trunk/Source/WebCore/svg/SVGTextElement.cpp

    r154365 r154371  
    2525
    2626#include "Attribute.h"
    27 #include "NodeRenderingContext.h"
    2827#include "RenderSVGResource.h"
    2928#include "RenderSVGText.h"
    … …  
    7574}
    7675
    77 bool SVGTextElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
     76bool SVGTextElement::childShouldCreateRenderer(const Node* child) const
    7877{
    79     if (childContext.node()->isTextNode()
    80         || childContext.node()->hasTagName(SVGNames::aTag)
     78    if (child->isTextNode()
     79        || child->hasTagName(SVGNames::aTag)
    8180#if ENABLE(SVG_FONTS)
    82         || childContext.node()->hasTagName(SVGNames::altGlyphTag)
     81        || child->hasTagName(SVGNames::altGlyphTag)
    8382#endif
    84         || childContext.node()->hasTagName(SVGNames::textPathTag)
    85         || childContext.node()->hasTagName(SVGNames::trefTag)
    86         || childContext.node()->hasTagName(SVGNames::tspanTag))
     83        || child->hasTagName(SVGNames::textPathTag)
     84        || child->hasTagName(SVGNames::trefTag)
     85        || child->hasTagName(SVGNames::tspanTag))
    8786        return true;
    8887

  • trunk/Source/WebCore/svg/SVGTextElement.h

    r154365 r154371  
    3939
    4040    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    41     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     41    virtual bool childShouldCreateRenderer(const Node*) const;
    4242};
    4343

  • trunk/Source/WebCore/svg/SVGTextPathElement.cpp

    r154365 r154371  
    2525
    2626#include "Attribute.h"
    27 #include "NodeRenderingContext.h"
    2827#include "RenderSVGResource.h"
    2928#include "RenderSVGTextPath.h"
    … …  
    135134}
    136135
    137 bool SVGTextPathElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
    138 {
    139     if (childContext.node()->isTextNode()
    140         || childContext.node()->hasTagName(SVGNames::aTag)
    141         || childContext.node()->hasTagName(SVGNames::trefTag)
    142         || childContext.node()->hasTagName(SVGNames::tspanTag))
     136bool SVGTextPathElement::childShouldCreateRenderer(const Node* child) const
     137{
     138    if (child->isTextNode()
     139        || child->hasTagName(SVGNames::aTag)
     140        || child->hasTagName(SVGNames::trefTag)
     141        || child->hasTagName(SVGNames::tspanTag))
    143142        return true;
    144143

  • trunk/Source/WebCore/svg/SVGTextPathElement.h

    r154365 r154371  
    129129
    130130    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    131     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;
     131    virtual bool childShouldCreateRenderer(const Node*) const;
    132132    virtual bool rendererIsNeeded(const RenderStyle&);
    133133

  • trunk/Source/WebCore/testing/Internals.cpp

    r154348 r154371  
    7373#include "MemoryCache.h"
    7474#include "MemoryInfo.h"
    75 #include "NodeRenderingContext.h"
    7675#include "Page.h"
    7776#include "PrintContext.h"
Note: See TracChangeset for help on using the changeset viewer.