Changeset 143089 in webkit


Ignore:
Timestamp:
Feb 15, 2013 6:36:29 PM (11 years ago)
Author:
esprehn@chromium.org
Message:

Rename HasCustomCallbacks to HasCustomStyleCallbacks
​https://bugs.webkit.org/show_bug.cgi?id=109982

Reviewed by Eric Seidel.

Now that inside ChildFrameDisconnector we only call isFrameOwnerElement()
on elements that report having descendants (or themselves) have connected
frames we don't need to be as agressive about avoiding the virtual call
to isFrameOwnerElement() which lets us rename hasCustomCallbacks to
hasCustomStyleCallbacks to better reflect it's purpose.

  • dom/ContainerNodeAlgorithms.h:

(WebCore::ChildFrameDisconnector::collectFrameOwners):

  • dom/Element.cpp:

(WebCore::Element::styleForRenderer):
(WebCore::Element::recalcStyle):
(WebCore::Element::willRecalcStyle):
(WebCore::Element::didRecalcStyle):
(WebCore::Element::customStyleForRenderer):

  • dom/Node.h:

(WebCore::Node::pseudoId):
(WebCore::Node::hasCustomStyleCallbacks):
(WebCore::Node::customPseudoId):
(WebCore::Node::setHasCustomStyleCallbacks):

  • dom/PseudoElement.cpp:

(WebCore::PseudoElement::PseudoElement):

  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::recalcStyle):

  • html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::HTMLFormControlElement):

  • html/HTMLFrameOwnerElement.cpp:

(WebCore::HTMLFrameOwnerElement::HTMLFrameOwnerElement):
(WebCore::HTMLFrameOwnerElement::disconnectContentFrame):

  • html/HTMLFrameSetElement.cpp:

(WebCore::HTMLFrameSetElement::HTMLFrameSetElement):

  • html/HTMLIFrameElement.cpp:

(WebCore::HTMLIFrameElement::HTMLIFrameElement):

  • html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::HTMLInputElement):

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement):

  • html/HTMLOptGroupElement.cpp:

(WebCore::HTMLOptGroupElement::HTMLOptGroupElement):

  • html/HTMLOptionElement.cpp:

(WebCore::HTMLOptionElement::HTMLOptionElement):

  • html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):

  • html/shadow/DateTimeEditElement.cpp:

(WebCore::DateTimeEditElement::DateTimeEditElement):

  • html/shadow/TextControlInnerElements.cpp:

(WebCore::TextControlInnerElement::TextControlInnerElement):
(WebCore::TextControlInnerTextElement::TextControlInnerTextElement):

  • html/shadow/TextFieldDecorationElement.cpp:

(WebCore::TextFieldDecorationElement::TextFieldDecorationElement):

  • svg/SVGElement.cpp:

(WebCore::SVGElement::SVGElement):

  • svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::SVGUseElement):

Location:
trunk/Source/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r143088 r143089  
     12013-02-15  Elliott Sprehn  <esprehn@chromium.org>
     2
     3        Rename HasCustomCallbacks to HasCustomStyleCallbacks
     4        https://bugs.webkit.org/show_bug.cgi?id=109982
     5
     6        Reviewed by Eric Seidel.
     7
     8        Now that inside ChildFrameDisconnector we only call isFrameOwnerElement()
     9        on elements that report having descendants (or themselves) have connected
     10        frames we don't need to be as agressive about avoiding the virtual call
     11        to isFrameOwnerElement() which lets us rename hasCustomCallbacks to
     12        hasCustomStyleCallbacks to better reflect it's purpose.
     13
     14        * dom/ContainerNodeAlgorithms.h:
     15        (WebCore::ChildFrameDisconnector::collectFrameOwners):
     16        * dom/Element.cpp:
     17        (WebCore::Element::styleForRenderer):
     18        (WebCore::Element::recalcStyle):
     19        (WebCore::Element::willRecalcStyle):
     20        (WebCore::Element::didRecalcStyle):
     21        (WebCore::Element::customStyleForRenderer):
     22        * dom/Node.h:
     23        (WebCore::Node::pseudoId):
     24        (WebCore::Node::hasCustomStyleCallbacks):
     25        (WebCore::Node::customPseudoId):
     26        (WebCore::Node::setHasCustomStyleCallbacks):
     27        * dom/PseudoElement.cpp:
     28        (WebCore::PseudoElement::PseudoElement):
     29        * dom/ShadowRoot.cpp:
     30        (WebCore::ShadowRoot::recalcStyle):
     31        * html/HTMLFormControlElement.cpp:
     32        (WebCore::HTMLFormControlElement::HTMLFormControlElement):
     33        * html/HTMLFrameOwnerElement.cpp:
     34        (WebCore::HTMLFrameOwnerElement::HTMLFrameOwnerElement):
     35        (WebCore::HTMLFrameOwnerElement::disconnectContentFrame):
     36        * html/HTMLFrameSetElement.cpp:
     37        (WebCore::HTMLFrameSetElement::HTMLFrameSetElement):
     38        * html/HTMLIFrameElement.cpp:
     39        (WebCore::HTMLIFrameElement::HTMLIFrameElement):
     40        * html/HTMLInputElement.cpp:
     41        (WebCore::HTMLInputElement::HTMLInputElement):
     42        * html/HTMLMediaElement.cpp:
     43        (WebCore::HTMLMediaElement::HTMLMediaElement):
     44        * html/HTMLOptGroupElement.cpp:
     45        (WebCore::HTMLOptGroupElement::HTMLOptGroupElement):
     46        * html/HTMLOptionElement.cpp:
     47        (WebCore::HTMLOptionElement::HTMLOptionElement):
     48        * html/HTMLPlugInImageElement.cpp:
     49        (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
     50        * html/shadow/DateTimeEditElement.cpp:
     51        (WebCore::DateTimeEditElement::DateTimeEditElement):
     52        * html/shadow/TextControlInnerElements.cpp:
     53        (WebCore::TextControlInnerElement::TextControlInnerElement):
     54        (WebCore::TextControlInnerTextElement::TextControlInnerTextElement):
     55        * html/shadow/TextFieldDecorationElement.cpp:
     56        (WebCore::TextFieldDecorationElement::TextFieldDecorationElement):
     57        * svg/SVGElement.cpp:
     58        (WebCore::SVGElement::SVGElement):
     59        * svg/SVGUseElement.cpp:
     60        (WebCore::SVGUseElement::SVGUseElement):
     61
    1622013-02-15  Eric Carlson  <eric.carlson@apple.com>
    263

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

    r142899 r143089  
    292292        return;
    293293
    294     // FIXME: This should just check isElementNode() to avoid the virtual call
    295     // and we should not depend on hasCustomCallbacks().
    296     if (root->hasCustomCallbacks() && root->isFrameOwnerElement())
     294    if (root->isHTMLElement() && root->isFrameOwnerElement())
    297295        m_frameOwners.append(toFrameOwnerElement(root));
    298296

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

    r143076 r143089  
    13171317PassRefPtr<RenderStyle> Element::styleForRenderer()
    13181318{
    1319     if (hasCustomCallbacks()) {
     1319    if (hasCustomStyleCallbacks()) {
    13201320        if (RefPtr<RenderStyle> style = customStyleForRenderer())
    13211321            return style.release();
    … …  
    13271327void Element::recalcStyle(StyleChange change)
    13281328{
    1329     if (hasCustomCallbacks()) {
     1329    if (hasCustomStyleCallbacks()) {
    13301330        if (!willRecalcStyle(change))
    13311331            return;
    … …  
    13521352            clearChildNeedsStyleRecalc();
    13531353
    1354             if (hasCustomCallbacks())
     1354            if (hasCustomStyleCallbacks())
    13551355                didRecalcStyle(change);
    13561356            return;
    … …  
    14231423    clearChildNeedsStyleRecalc();
    14241424   
    1425     if (hasCustomCallbacks())
     1425    if (hasCustomStyleCallbacks())
    14261426        didRecalcStyle(change);
    14271427}
    … …  
    27232723bool Element::willRecalcStyle(StyleChange)
    27242724{
    2725     ASSERT(hasCustomCallbacks());
     2725    ASSERT(hasCustomStyleCallbacks());
    27262726    return true;
    27272727}
    … …  
    27292729void Element::didRecalcStyle(StyleChange)
    27302730{
    2731     ASSERT(hasCustomCallbacks());
     2731    ASSERT(hasCustomStyleCallbacks());
    27322732}
    27332733
    … …  
    27352735PassRefPtr<RenderStyle> Element::customStyleForRenderer()
    27362736{
    2737     ASSERT(hasCustomCallbacks());
     2737    ASSERT(hasCustomStyleCallbacks());
    27382738    return 0;
    27392739}

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

    r141972 r143089  
    234234    bool isBeforePseudoElement() const { return pseudoId() == BEFORE; }
    235235    bool isAfterPseudoElement() const { return pseudoId() == AFTER; }
    236     PseudoId pseudoId() const { return (isElementNode() && hasCustomCallbacks()) ? customPseudoId() : NOPSEUDO; }
     236    PseudoId pseudoId() const { return (isElementNode() && hasCustomStyleCallbacks()) ? customPseudoId() : NOPSEUDO; }
    237237
    238238    virtual bool isMediaControlElement() const { return false; }
    … …  
    260260
    261261    bool inNamedFlow() const { return getFlag(InNamedFlowFlag); }
    262     bool hasCustomCallbacks() const { return getFlag(HasCustomCallbacksFlag); }
     262    bool hasCustomStyleCallbacks() const { return getFlag(HasCustomStyleCallbacksFlag); }
    263263
    264264    bool hasSyntheticAttrChildNodes() const { return getFlag(HasSyntheticAttrChildNodesFlag); }
    … …  
    718718        InNamedFlowFlag = 1 << 19,
    719719        HasSyntheticAttrChildNodesFlag = 1 << 20,
    720         HasCustomCallbacksFlag = 1 << 21,
     720        HasCustomStyleCallbacksFlag = 1 << 21,
    721721        HasScopedHTMLStyleChildFlag = 1 << 22,
    722722        HasEventTargetDataFlag = 1 << 23,
    … …  
    747747        CreateDocumentFragment = CreateContainer | IsDocumentFragmentFlag,
    748748        CreateStyledElement = CreateElement | IsStyledElementFlag,
    749         CreateHTMLElement = CreateStyledElement | IsHTMLFlag,
    750         CreateFrameOwnerElement = CreateHTMLElement | HasCustomCallbacksFlag,
     749        CreateHTMLElement = CreateStyledElement | IsHTMLFlag,
    751750        CreateSVGElement = CreateStyledElement | IsSVGFlag,
    752751        CreateDocument = CreateContainer | InDocumentFlag,
    … …  
    756755    Node(Document*, ConstructionType);
    757756
    758     virtual PseudoId customPseudoId() const
    759     {
    760         ASSERT(hasCustomCallbacks());
    761         return NOPSEUDO;
    762     }
    763 
    764757    virtual void didMoveToNewDocument(Document* oldDocument);
    765758   
    … …  
    774767    void clearEventTargetData();
    775768
    776     void setHasCustomCallbacks() { setFlag(true, HasCustomCallbacksFlag); }
     769    void setHasCustomStyleCallbacks() { setFlag(true, HasCustomStyleCallbacksFlag); }
    777770
    778771    Document* documentInternal() const { return treeScope()->documentScope(); }
    … …  
    781774private:
    782775    friend class TreeShared<Node>;
     776
     777    virtual PseudoId customPseudoId() const
     778    {
     779        ASSERT(hasCustomStyleCallbacks());
     780        return NOPSEUDO;
     781    }
    783782
    784783    void removedLastRef();

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

    r143060 r143089  
    6161    ASSERT(pseudoId != NOPSEUDO);
    6262    setParentOrShadowHostNode(parent);
    63     setHasCustomCallbacks();
     63    setHasCustomStyleCallbacks();
    6464}
    6565

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

    r141570 r143089  
    130130{
    131131    // ShadowRoot doesn't support custom callbacks.
    132     ASSERT(!hasCustomCallbacks());
     132    ASSERT(!hasCustomStyleCallbacks());
    133133
    134134    StyleResolver* styleResolver = document()->styleResolver();

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

    r141947 r143089  
    6464{
    6565    setForm(form ? form : findFormAncestor());
    66     setHasCustomCallbacks();
     66    setHasCustomStyleCallbacks();
    6767}
    6868

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

    r141524 r143089  
    3535
    3636HTMLFrameOwnerElement::HTMLFrameOwnerElement(const QualifiedName& tagName, Document* document)
    37     : HTMLElement(tagName, document, CreateFrameOwnerElement)
     37    : HTMLElement(tagName, document)
    3838    , m_contentFrame(0)
    3939    , m_sandboxFlags(SandboxNone)
    … …  
    7676void HTMLFrameOwnerElement::disconnectContentFrame()
    7777{
    78     ASSERT(hasCustomCallbacks());
    7978    // FIXME: Currently we don't do this in removedFrom because this causes an
    8079    // unload event in the subframe which could execute script that could then

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

    r135069 r143089  
    5757    ASSERT(hasTagName(framesetTag));
    5858   
    59     setHasCustomCallbacks();
     59    setHasCustomStyleCallbacks();
    6060}
    6161

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

    r138897 r143089  
    4444{
    4545    ASSERT(hasTagName(iframeTag));
    46     setHasCustomCallbacks();
     46    setHasCustomStyleCallbacks();
    4747}
    4848

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

    r142827 r143089  
    137137    ASSERT(hasTagName(inputTag) || hasTagName(isindexTag));
    138138#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
    139     setHasCustomCallbacks();
     139    setHasCustomStyleCallbacks();
    140140#endif
    141141}

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

    r143072 r143089  
    314314#endif
    315315
    316     setHasCustomCallbacks();
     316    setHasCustomStyleCallbacks();
    317317    addElementToDocumentMap(this, document);
    318318

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

    r139064 r143089  
    4343{
    4444    ASSERT(hasTagName(optgroupTag));
    45     setHasCustomCallbacks();
     45    setHasCustomStyleCallbacks();
    4646}
    4747

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

    r139064 r143089  
    5757{
    5858    ASSERT(hasTagName(optionTag));
    59     setHasCustomCallbacks();
     59    setHasCustomStyleCallbacks();
    6060}
    6161

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

    r142685 r143089  
    7878    , m_swapRendererTimer(this, &HTMLPlugInImageElement::swapRendererTimerFired)
    7979{
    80     setHasCustomCallbacks();
     80    setHasCustomStyleCallbacks();
    8181}
    8282

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

    r142592 r143089  
    403403    DEFINE_STATIC_LOCAL(AtomicString, dateTimeEditPseudoId, ("-webkit-datetime-edit", AtomicString::ConstructFromLiteral));
    404404    setPseudo(dateTimeEditPseudoId);
    405     setHasCustomCallbacks();
     405    setHasCustomStyleCallbacks();
    406406}
    407407

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

    r137124 r143089  
    5454    : HTMLDivElement(divTag, document)
    5555{
    56     setHasCustomCallbacks();
     56    setHasCustomStyleCallbacks();
    5757}
    5858
    … …  
    7373    : HTMLDivElement(divTag, document)
    7474{
    75     setHasCustomCallbacks();
     75    setHasCustomStyleCallbacks();
    7676}
    7777

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

    r141235 r143089  
    6363{
    6464    ASSERT(decorator);
    65     setHasCustomCallbacks();
     65    setHasCustomStyleCallbacks();
    6666}
    6767

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

    r142791 r143089  
    5252    : StyledElement(tagName, document, constructionType)
    5353{
    54     setHasCustomCallbacks();
     54    setHasCustomStyleCallbacks();
    5555}
    5656

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

    r141066 r143089  
    9494    , m_svgLoadEventTimer(this, &SVGElement::svgLoadEventTimerFired)
    9595{
    96     ASSERT(hasCustomCallbacks());
     96    ASSERT(hasCustomStyleCallbacks());
    9797    ASSERT(hasTagName(SVGNames::useTag));
    9898    registerAnimatedPropertiesForSVGUseElement();
Note: See TracChangeset for help on using the changeset viewer.