Changeset 224316 in webkit


Ignore:
Timestamp:
Nov 1, 2017 9:13:18 PM (6 years ago)
Author:
dbates@webkit.org
Message:

Change Element::didAddUserAgentShadowRoot() to take a reference instead of a pointer
​https://bugs.webkit.org/show_bug.cgi?id=179153

Reviewed by Ryosuke Niwa.

Element::didAddUserAgentShadowRoot() is always passed a non-null pointer to the added
ShadowRoot. Therefore we should have didAddUserAgentShadowRoot() take a lvalue reference
to a ShadowRoot.

No functionality changed. So, no new tests.

  • dom/Element.cpp:

(WebCore::Element::addShadowRoot):

  • dom/Element.h:

(WebCore::Element::didAddUserAgentShadowRoot):

  • html/HTMLDetailsElement.cpp:

(WebCore::HTMLDetailsElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLInputElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLMeterElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):

  • html/HTMLPlugInElement.h:
  • html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLProgressElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLSummaryElement::didAddUserAgentShadowRoot):

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

(WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot):

  • html/HTMLTextAreaElement.h:
Location:
trunk/Source/WebCore
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r224315 r224316  
     12017-11-01  Daniel Bates  <dabates@apple.com>
     2
     3        Change Element::didAddUserAgentShadowRoot() to take a reference instead of a pointer
     4        https://bugs.webkit.org/show_bug.cgi?id=179153
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Element::didAddUserAgentShadowRoot() is always passed a non-null pointer to the added
     9        ShadowRoot. Therefore we should have didAddUserAgentShadowRoot() take a lvalue reference
     10        to a ShadowRoot.
     11
     12        No functionality changed. So, no new tests.
     13
     14        * dom/Element.cpp:
     15        (WebCore::Element::addShadowRoot):
     16        * dom/Element.h:
     17        (WebCore::Element::didAddUserAgentShadowRoot):
     18        * html/HTMLDetailsElement.cpp:
     19        (WebCore::HTMLDetailsElement::didAddUserAgentShadowRoot):
     20        * html/HTMLDetailsElement.h:
     21        * html/HTMLInputElement.cpp:
     22        (WebCore::HTMLInputElement::didAddUserAgentShadowRoot):
     23        * html/HTMLInputElement.h:
     24        * html/HTMLMediaElement.cpp:
     25        (WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
     26        * html/HTMLMediaElement.h:
     27        * html/HTMLMeterElement.cpp:
     28        (WebCore::HTMLMeterElement::didAddUserAgentShadowRoot):
     29        * html/HTMLMeterElement.h:
     30        * html/HTMLPlugInElement.cpp:
     31        (WebCore::HTMLPlugInElement::didAddUserAgentShadowRoot):
     32        * html/HTMLPlugInElement.h:
     33        * html/HTMLPlugInImageElement.cpp:
     34        (WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):
     35        * html/HTMLPlugInImageElement.h:
     36        * html/HTMLProgressElement.cpp:
     37        (WebCore::HTMLProgressElement::didAddUserAgentShadowRoot):
     38        * html/HTMLProgressElement.h:
     39        * html/HTMLSummaryElement.cpp:
     40        (WebCore::HTMLSummaryElement::didAddUserAgentShadowRoot):
     41        * html/HTMLSummaryElement.h:
     42        * html/HTMLTextAreaElement.cpp:
     43        (WebCore::HTMLTextAreaElement::didAddUserAgentShadowRoot):
     44        * html/HTMLTextAreaElement.h:
     45
    1462017-11-01  Jeremy Jones  <jeremyj@apple.com>
    247

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

    r224260 r224316  
    17931793
    17941794    if (shadowRoot.mode() == ShadowRootMode::UserAgent)
    1795         didAddUserAgentShadowRoot(&shadowRoot);
     1795        didAddUserAgentShadowRoot(shadowRoot);
    17961796}
    17971797

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

    r224307 r224316  
    580580    bool isUserActionElementHovered() const;
    581581
    582     virtual void didAddUserAgentShadowRoot(ShadowRoot*) { }
     582    virtual void didAddUserAgentShadowRoot(ShadowRoot&) { }
    583583
    584584    // FIXME: Remove the need for Attr to call willModifyAttribute/didModifyAttribute.

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

    r219237 r224316  
    105105}
    106106
    107 void HTMLDetailsElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     107void HTMLDetailsElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    108108{
    109109    auto summarySlot = HTMLSlotElement::create(slotTag, document());
    … …  
    116116
    117117    summarySlot->appendChild(defaultSummary);
    118     root->appendChild(summarySlot);
     118    root.appendChild(summarySlot);
    119119
    120120    m_defaultSlot = HTMLSlotElement::create(slotTag, document());

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

    r208179 r224316  
    4848    void parseAttribute(const QualifiedName&, const AtomicString&) final;
    4949
    50     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     50    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    5151    bool hasCustomFocusLogic() const final { return true; }
    5252

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

    r223802 r224316  
    142142}
    143143
    144 void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)
     144void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot&)
    145145{
    146146    m_inputType->createShadowSubtree();

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

    r223802 r224316  
    347347    enum AutoCompleteSetting { Uninitialized, On, Off };
    348348
    349     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     349    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    350350
    351351    void willChangeForm() final;

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

    r224309 r224316  
    70317031}
    70327032
    7033 void HTMLMediaElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     7033void HTMLMediaElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    70347034{
    70357035    DEBUG_LOG(LOGIDENTIFIER);

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

    r224307 r224316  
    839839
    840840#if ENABLE(MEDIA_CONTROLS_SCRIPT)
    841     void didAddUserAgentShadowRoot(ShadowRoot*) override;
     841    void didAddUserAgentShadowRoot(ShadowRoot&) override;
    842842    DOMWrapperWorld& ensureIsolatedWorld();
    843843    bool ensureMediaControlsInjectedScript();

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

    r223728 r224316  
    221221}
    222222
    223 void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     223void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    224224{
    225225    ASSERT(!m_value);
    … …  
    229229    auto style = HTMLStyleElement::create(HTMLNames::styleTag, document(), false);
    230230    style->setTextContent(shadowStyle);
    231     root->appendChild(style);
     231    root.appendChild(style);
    232232
    233233    // Pseudos are set to allow author styling.
    … …  
    235235    inner->setIdAttribute("inner");
    236236    inner->setPseudo("-webkit-meter-inner-element");
    237     root->appendChild(inner);
     237    root.appendChild(inner);
    238238
    239239    auto bar = HTMLDivElement::create(document());

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

    r208179 r224316  
    7676
    7777    void didElementStateChange();
    78     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     78    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    7979
    8080    RefPtr<HTMLElement> m_value;

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

    r223644 r224316  
    293293}
    294294
    295 void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     295void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    296296{
    297297    if (!m_pluginReplacement || !document().page() || displayState() != PreparingPluginReplacement)
    298298        return;
    299299   
    300     root->setResetStyleInheritance(true);
    301     if (m_pluginReplacement->installReplacement(*root)) {
     300    root.setResetStyleInheritance(true);
     301    if (m_pluginReplacement->installReplacement(root)) {
    302302        setDisplayState(DisplayingPluginReplacement);
    303303        invalidateStyleAndRenderersForSubtree();

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

    r218913 r224316  
    9999    virtual bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues);
    100100    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
    101     void didAddUserAgentShadowRoot(ShadowRoot*) override;
     101    void didAddUserAgentShadowRoot(ShadowRoot&) override;
    102102
    103103    // Subclasses should use guardedDispatchBeforeLoadEvent instead of calling dispatchBeforeLoadEvent directly.

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

    r224309 r224316  
    342342}
    343343
    344 void HTMLPlugInImageElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     344void HTMLPlugInImageElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    345345{
    346346    HTMLPlugInElement::didAddUserAgentShadowRoot(root);
    … …  
    355355    // styles defined in the injected user agents stylesheets to specify
    356356    // the look-and-feel of the snapshotted plug-in overlay.
    357     root->setResetStyleInheritance(true);
     357    root.setResetStyleInheritance(true);
    358358   
    359359    String mimeType = loadedMimeType();

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

    r220052 r224316  
    107107    bool allowedToLoadPluginContent(const String& url, const String& mimeType) const;
    108108
    109     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     109    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    110110
    111111    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;

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

    r223728 r224316  
    135135}
    136136
    137 void HTMLProgressElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     137void HTMLProgressElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    138138{
    139139    ASSERT(!m_value);
    140140
    141141    auto inner = ProgressInnerElement::create(document());
    142     root->appendChild(inner);
     142    root.appendChild(inner);
    143143
    144144    auto bar = ProgressBarElement::create(document());

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

    r208096 r224316  
    5959
    6060    void didElementStateChange();
    61     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     61    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    6262    bool isDeterminate() const;
    6363

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

    r223644 r224316  
    6666}
    6767
    68 void HTMLSummaryElement::didAddUserAgentShadowRoot(ShadowRoot* root)
     68void HTMLSummaryElement::didAddUserAgentShadowRoot(ShadowRoot& root)
    6969{
    70     root->appendChild(DetailsMarkerControl::create(document()));
    71     root->appendChild(HTMLSlotElement::create(slotTag, document()));
     70    root.appendChild(DetailsMarkerControl::create(document()));
     71    root.appendChild(HTMLSlotElement::create(slotTag, document()));
    7272}
    7373

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

    r208179 r224316  
    4040    void defaultEventHandler(Event&) final;
    4141
    42     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     42    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    4343
    4444    bool hasCustomFocusLogic() const final { return true; }

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

    r223644 r224316  
    101101}
    102102
    103 void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot* root)
    104 {
    105     root->appendChild(TextControlInnerTextElement::create(document()));
     103void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot& root)
     104{
     105    root.appendChild(TextControlInnerTextElement::create(document()));
    106106    updateInnerTextElementEditability();
    107107}

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

    r223644 r224316  
    7272    enum WrapMethod { NoWrap, SoftWrap, HardWrap };
    7373
    74     void didAddUserAgentShadowRoot(ShadowRoot*) final;
     74    void didAddUserAgentShadowRoot(ShadowRoot&) final;
    7575
    7676    void maxLengthAttributeChanged(const AtomicString& newValue);
Note: See TracChangeset for help on using the changeset viewer.