Changeset 91235 in webkit


Ignore:
Timestamp:
Jul 18, 2011 7:55:22 PM (13 years ago)
Author:
morrita@google.com
Message:

.: [ShadowContentElement] forwarded node should be able to access its hosting content element.
​https://bugs.webkit.org/show_bug.cgi?id=64251

Reviewed by Dimitri Glazkov.

Added GTK symbols for new window.internals methods.

  • Source/autotools/symbols.filter:

Source/WebCore: [ShadowContentElement] forwarded node should be able to access its hosting content element.
​https://bugs.webkit.org/show_bug.cgi?id=64251

Reviewed by Dimitri Glazkov.

  • Introduced ShadowInclusionSet to manage included nodes to its includer content element. ShadowInclusionSet instance is owned by ShadowRoot.
  • Updated the set on inclusion list changes.
  • Used the set to retrieve the content element of NodeRenderingContext.

There are also related refactoring and cleanup:

  • Renamed NodeRenderingContext::m_contentElement to m_includer
  • ShadowContentSelector::m_activeElement is no longer used, thus removed.

Test: fast/dom/shadow/content-element-includer.html

  • WebCore.exp.in:
  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):
(WebCore::NodeRenderingContext::nextRenderer):
(WebCore::NodeRenderingContext::previousRenderer):

  • dom/NodeRenderingContext.h:

(WebCore::NodeRenderingContext::includer):

  • dom/ShadowContentElement.cpp:

(WebCore::removeFromSet):
(WebCore::addToSet):
(WebCore::ShadowContentElement::attach):
(WebCore::ShadowContentElement::detach):

  • dom/ShadowContentElement.h:

(WebCore::ShadowInclusionSet::add):
(WebCore::ShadowInclusionSet::remove):
(WebCore::ShadowInclusionSet::isEmpty):
(WebCore::ShadowInclusionSet::Translator::hash):
(WebCore::ShadowInclusionSet::Translator::equal):
(WebCore::ShadowInclusionSet::Hash::hash):
(WebCore::ShadowInclusionSet::Hash::equal):
(WebCore::ShadowInclusionSet::find):

  • dom/ShadowContentSelector.cpp:

(WebCore::ShadowContentSelector::ShadowContentSelector):
(WebCore::ShadowContentSelector::selectInclusion):

  • dom/ShadowContentSelector.h:
  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::~ShadowRoot):
(WebCore::ShadowRoot::includerFor):
(WebCore::ShadowRoot::inclusions):
(WebCore::ShadowRoot::ensureInclusions):

  • dom/ShadowRoot.h:

(WebCore::toShadowRoot):

  • testing/Internals.cpp:

(WebCore::Internals::includerFor):

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit2: [ShadowContentElement] forwarded node should be able to access its hosting content element.
​https://bugs.webkit.org/show_bug.cgi?id=64251

Reviewed by Dimitri Glazkov.

Exported additional symbols for window.internals object.

  • win/WebKit2.def:
  • win/WebKit2CFLite.def:

LayoutTests: [ShadowContentElement] forwarded node should be able to access its hosting content element.
​https://bugs.webkit.org/show_bug.cgi?id=64251

Reviewed by Dimitri Glazkov.

  • Added a new test.
  • Updated expectations. This change make ShadowContentElement availability on NodeRenderingContext more strict. that makes some redundant node disappeared.
  • fast/dom/shadow/content-element-includer-expected.txt: Added.
  • fast/dom/shadow/content-element-includer.html: Added.
  • platform/chromium-win/fast/html/details-nested-2-expected.txt:
  • platform/gtk/fast/html/details-nested-2-expected.txt:
  • platform/mac/fast/html/details-nested-2-expected.txt:
  • platform/qt/fast/html/details-nested-2-expected.txt:
Location:
trunk
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r91078 r91235  
     12011-07-18  MORITA Hajime  <morrita@google.com>
     2
     3        [ShadowContentElement] forwarded node should be able to access its hosting content element.
     4        https://bugs.webkit.org/show_bug.cgi?id=64251
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Added GTK symbols for new window.internals methods.
     9       
     10        * Source/autotools/symbols.filter:
     11
    1122011-07-15  Martin Robinson  <mrobinson@igalia.com>
    213

  • trunk/LayoutTests/ChangeLog

    r91234 r91235  
     12011-07-18  MORITA Hajime  <morrita@google.com>
     2
     3        [ShadowContentElement] forwarded node should be able to access its hosting content element.
     4        https://bugs.webkit.org/show_bug.cgi?id=64251
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        - Added a new test.
     9        - Updated expectations. This change make ShadowContentElement availability on NodeRenderingContext
     10          more strict. that makes some redundant node disappeared.
     11
     12        * fast/dom/shadow/content-element-includer-expected.txt: Added.
     13        * fast/dom/shadow/content-element-includer.html: Added.
     14        * platform/chromium-win/fast/html/details-nested-2-expected.txt:
     15        * platform/gtk/fast/html/details-nested-2-expected.txt:
     16        * platform/mac/fast/html/details-nested-2-expected.txt:
     17        * platform/qt/fast/html/details-nested-2-expected.txt:
     18
    1192011-07-18  Ryosuke Niwa  <rniwa@webkit.org>
    220

  • trunk/LayoutTests/platform/chromium-win/fast/html/details-nested-2-expected.txt

    r90987 r91235  
    1010            text run at (24,8) width 4: " "
    1111            text run at (28,8) width 54: "summary"
    12         RenderBlock (anonymous) at (8,44) size 768x0
    1312        RenderDetails {DETAILS} at (8,44) size 768x72 [border: (8px solid #995555)]
    1413          RenderSummary {SUMMARY} at (8,8) size 752x36 [border: (8px solid #CC9999)]

  • trunk/LayoutTests/platform/gtk/fast/html/details-nested-2-expected.txt

    r90987 r91235  
    1010            text run at (24,8) width 4: " "
    1111            text run at (28,8) width 58: "summary"
    12         RenderBlock (anonymous) at (8,43) size 768x0
    1312        RenderDetails {DETAILS} at (8,43) size 768x70 [border: (8px solid #995555)]
    1413          RenderSummary {SUMMARY} at (8,8) size 752x35 [border: (8px solid #CC9999)]

  • trunk/LayoutTests/platform/mac/fast/html/details-nested-2-expected.txt

    r90987 r91235  
    1010            text run at (24,8) width 4: " "
    1111            text run at (28,8) width 58: "summary"
    12         RenderBlock (anonymous) at (8,42) size 768x0
    1312        RenderDetails {DETAILS} at (8,42) size 768x68 [border: (8px solid #995555)]
    1413          RenderSummary {SUMMARY} at (8,8) size 752x34 [border: (8px solid #CC9999)]

  • trunk/LayoutTests/platform/qt/fast/html/details-nested-2-expected.txt

    r90987 r91235  
    1010            text run at (24,8) width 4: " "
    1111            text run at (28,8) width 64: "summary"
    12         RenderBlock (anonymous) at (8,46) size 768x0
    1312        RenderDetails {DETAILS} at (8,46) size 768x76 [border: (8px solid #995555)]
    1413          RenderSummary {SUMMARY} at (8,8) size 752x38 [border: (8px solid #CC9999)]

  • trunk/Source/WebCore/ChangeLog

    r91232 r91235  
     12011-07-18  MORITA Hajime  <morrita@google.com>
     2
     3        [ShadowContentElement] forwarded node should be able to access its hosting content element.
     4        https://bugs.webkit.org/show_bug.cgi?id=64251
     5       
     6        Reviewed by Dimitri Glazkov.
     7
     8        - Introduced ShadowInclusionSet to manage included nodes to its includer content element.
     9          ShadowInclusionSet instance is owned by ShadowRoot.
     10        - Updated the set on inclusion list changes.
     11        - Used the set to retrieve the content element of NodeRenderingContext.
     12       
     13        There are also related refactoring and cleanup:
     14        - Renamed NodeRenderingContext::m_contentElement to m_includer
     15        - ShadowContentSelector::m_activeElement is no longer used, thus removed.
     16       
     17        Test: fast/dom/shadow/content-element-includer.html
     18
     19        * WebCore.exp.in:
     20        * dom/NodeRenderingContext.cpp:
     21        (WebCore::NodeRenderingContext::NodeRenderingContext):
     22        (WebCore::NodeRenderingContext::nextRenderer):
     23        (WebCore::NodeRenderingContext::previousRenderer):
     24        * dom/NodeRenderingContext.h:
     25        (WebCore::NodeRenderingContext::includer):
     26        * dom/ShadowContentElement.cpp:
     27        (WebCore::removeFromSet):
     28        (WebCore::addToSet):
     29        (WebCore::ShadowContentElement::attach):
     30        (WebCore::ShadowContentElement::detach):
     31        * dom/ShadowContentElement.h:
     32        (WebCore::ShadowInclusionSet::add):
     33        (WebCore::ShadowInclusionSet::remove):
     34        (WebCore::ShadowInclusionSet::isEmpty):
     35        (WebCore::ShadowInclusionSet::Translator::hash):
     36        (WebCore::ShadowInclusionSet::Translator::equal):
     37        (WebCore::ShadowInclusionSet::Hash::hash):
     38        (WebCore::ShadowInclusionSet::Hash::equal):
     39        (WebCore::ShadowInclusionSet::find):
     40        * dom/ShadowContentSelector.cpp:
     41        (WebCore::ShadowContentSelector::ShadowContentSelector):
     42        (WebCore::ShadowContentSelector::selectInclusion):
     43        * dom/ShadowContentSelector.h:
     44        * dom/ShadowRoot.cpp:
     45        (WebCore::ShadowRoot::~ShadowRoot):
     46        (WebCore::ShadowRoot::includerFor):
     47        (WebCore::ShadowRoot::inclusions):
     48        (WebCore::ShadowRoot::ensureInclusions):
     49        * dom/ShadowRoot.h:
     50        (WebCore::toShadowRoot):
     51        * testing/Internals.cpp:
     52        (WebCore::Internals::includerFor):
     53        * testing/Internals.h:
     54        * testing/Internals.idl:
     55
    1562011-07-18  Dean Jackson  <dino@apple.com>
    257

  • trunk/Source/WebCore/WebCore.exp.in

    r91198 r91235  
    542542__ZN7WebCore19TextResourceDecoderD1Ev
    543543__ZN7WebCore19applicationIsSafariEv
     544__ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE
     545__ZN7WebCore20NodeRenderingContextD1Ev
    544546__ZN7WebCore20RenderEmbeddedObject30setShowsCrashedPluginIndicatorEv
    545547__ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx

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

    r90987 r91235  
    4242    , m_parentNodeForRenderingAndStyle(0)
    4343    , m_visualParentShadowRoot(0)
    44     , m_contentElement(0)
     44    , m_includer(0)
    4545    , m_style(0)
    4646{
    … …  
    6161
    6262        if (m_visualParentShadowRoot) {
    63             if ((m_contentElement = m_visualParentShadowRoot->activeContentElement())) {
     63            if ((m_includer = m_visualParentShadowRoot->includerFor(m_node))) {
    6464                m_phase = AttachContentForwarded;
    65                 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_contentElement).parentNodeForRenderingAndStyle();
     65                m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_includer).parentNodeForRenderingAndStyle();
    6666                return;
    6767            }
    … …  
    8282    , m_parentNodeForRenderingAndStyle(0)
    8383    , m_visualParentShadowRoot(0)
    84     , m_contentElement(0)
     84    , m_includer(0)
    8585    , m_style(style)
    8686{
    … …  
    156156
    157157    if (m_phase == AttachContentForwarded) {
    158         if (RenderObject* found = nextRendererOf(m_contentElement, m_node))
     158        if (RenderObject* found = nextRendererOf(m_includer, m_node))
    159159            return found;
    160         return NodeRenderingContext(m_contentElement).nextRenderer();
     160        return NodeRenderingContext(m_includer).nextRenderer();
    161161    }
    162162
    … …  
    185185
    186186    if (m_phase == AttachContentForwarded) {
    187         if (RenderObject* found = previousRendererOf(m_contentElement, m_node))
     187        if (RenderObject* found = previousRendererOf(m_includer, m_node))
    188188            return found;
    189         return NodeRenderingContext(m_contentElement).previousRenderer();
     189        return NodeRenderingContext(m_includer).previousRenderer();
    190190    }
    191191

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

    r90987 r91235  
    5151    RenderObject* nextRenderer() const;
    5252    RenderObject* previousRenderer() const;
     53    ShadowContentElement* includer() const;
    5354
    5455    RenderStyle* style() const;
    … …  
    8081    ContainerNode* m_parentNodeForRenderingAndStyle;
    8182    ShadowRoot* m_visualParentShadowRoot;
    82     ShadowContentElement* m_contentElement;
     83    ShadowContentElement* m_includer;
    8384    RefPtr<RenderStyle> m_style;
    8485};
    … …  
    9899{
    99100    return m_style.get();
     101}
     102
     103inline ShadowContentElement* NodeRenderingContext::includer() const
     104{
     105    return m_includer;
    100106}
    101107

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

    r90987 r91235  
    3030#include "HTMLNames.h"
    3131#include "ShadowContentSelector.h"
     32#include "ShadowRoot.h"
    3233
    3334namespace WebCore {
    … …  
    9899}
    99100
    100 
    101101PassRefPtr<ShadowContentElement> ShadowContentElement::create(Document* document)
    102102{
    … …  
    114114}
    115115
     116static void removeFromSet(ShadowInclusionList* list, ShadowInclusionSet* set)
     117{
     118    for (ShadowInclusion* inclusion = list->first(); inclusion; inclusion = inclusion->next())
     119        set->remove(inclusion);
     120}
     121
     122static void addToSet(ShadowInclusionList* list, ShadowInclusionSet* set)
     123{
     124    for (ShadowInclusion* inclusion = list->first(); inclusion; inclusion = inclusion->next())
     125        set->add(inclusion);
     126}
     127
    116128void ShadowContentElement::attach()
    117129{
    … …  
    119131    StyledElement::attach();
    120132    if (ShadowContentSelector* selector = ShadowContentSelector::currentInstance()) {
    121         selector->willAttachContentFor(this);
    122         selector->selectInclusion(&m_inclusions);
     133
     134        removeFromSet(&m_inclusions, selector->shadowRoot()->ensureInclusions());
     135        m_inclusions.clear();
     136        selector->selectInclusion(this, &m_inclusions);
     137        addToSet(&m_inclusions, selector->shadowRoot()->ensureInclusions());
     138
    123139        for (ShadowInclusion* inclusion = m_inclusions.first(); inclusion; inclusion = inclusion->next())
    124140            inclusion->content()->detach();
    125141        for (ShadowInclusion* inclusion = m_inclusions.first(); inclusion; inclusion = inclusion->next())
    126142            inclusion->content()->attach();
    127         selector->didAttachContent();
    128143    }
    129144}
    … …  
    131146void ShadowContentElement::detach()
    132147{
    133     m_inclusions.clear();
     148    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
     149        removeFromSet(&m_inclusions, root->ensureInclusions());
     150        m_inclusions.clear();
     151    }
     152
     153    ASSERT(m_inclusions.isEmpty());
    134154    StyledElement::detach();
    135155}

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

    r90987 r91235  
    3434#include "StyledElement.h"
    3535#include <wtf/Forward.h>
     36#include <wtf/HashSet.h>
    3637
    3738namespace WebCore {
    … …  
    6768}
    6869
    69 
    7070class ShadowInclusionList {
    7171public:
    … …  
    9292}
    9393
     94class ShadowInclusionSet {
     95public:
     96    void add(ShadowInclusion* value) { m_set.add(value); }
     97    void remove(ShadowInclusion* value) { m_set.remove(value); }
     98    bool isEmpty() const { return m_set.isEmpty(); }
     99    ShadowInclusion* find(Node* key) const;
     100
     101private:
     102    struct Translator {
     103    public:
     104        static unsigned hash(const Node* key) { return PtrHash<const Node*>::hash(key); }
     105        static bool equal(const ShadowInclusion* inclusion, const Node* content) { return inclusion->content() == content; }
     106    };
     107
     108    struct Hash {
     109        static unsigned hash(ShadowInclusion* key) { return PtrHash<const Node*>::hash(key->content()); }
     110        static bool equal(ShadowInclusion* a, ShadowInclusion* b) { return a->content() == b->content(); }
     111        static const bool safeToCompareToEmptyOrDeleted = false;
     112    };
     113
     114    typedef HashSet<ShadowInclusion*, Hash> PointerSet;
     115
     116    PointerSet m_set;
     117};
     118
     119inline ShadowInclusion* ShadowInclusionSet::find(Node* key) const
     120{
     121    PointerSet::iterator found = m_set.find<Node*, ShadowInclusionSet::Translator>(key);
     122    return found != m_set.end() ? *found : 0;
     123}
    94124
    95125// NOTE: Current implementation doesn't support dynamic insertion/deletion of ShadowContentElement.

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

    r90987 r91235  
    3939    : m_parent(s_currentInstance)
    4040    , m_shadowRoot(shadowRoot)
    41     , m_activeElement(0)
    4241{
    4342    s_currentInstance = this;
    … …  
    5251}
    5352
    54 void ShadowContentSelector::selectInclusion(ShadowInclusionList* inclusions)
     53void ShadowContentSelector::selectInclusion(ShadowContentElement* contentElement, ShadowInclusionList* inclusions)
    5554{
    56     inclusions->clear();
     55    ASSERT(inclusions->isEmpty());
    5756
    5857    for (size_t i = 0; i < m_children.size(); ++i) {
    … …  
    6059        if (!child)
    6160            continue;
    62         if (!m_activeElement->shouldInclude(child))
     61        if (!contentElement->shouldInclude(child))
    6362            continue;
    6463
    65         inclusions->append(m_activeElement, child);
     64        inclusions->append(contentElement, child);
    6665        m_children[i] = 0;
    6766    }
    68 
    69 }
    70 
    71 void ShadowContentSelector::willAttachContentFor(ShadowContentElement* element)
    72 {
    73     ASSERT(!m_activeElement);
    74     m_activeElement = element;
    75 }
    76 
    77 void ShadowContentSelector::didAttachContent()
    78 {
    79     ASSERT(m_activeElement);
    80     m_activeElement = 0;
    81 }
    82 
    83 ShadowContentElement* ShadowContentSelector::activeElement() const
    84 {
    85     return m_activeElement;
    8667}
    8768

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

    r90987 r91235  
    5050    ~ShadowContentSelector();
    5151
    52     void willAttachContentFor(ShadowContentElement*);
    53     void didAttachContent();
    54     void selectInclusion(ShadowInclusionList*);
     52    void selectInclusion(ShadowContentElement*, ShadowInclusionList*);
    5553
    5654    ShadowRoot* shadowRoot() const { return m_shadowRoot; }
    57     ShadowContentElement* activeElement() const;
    5855    static ShadowContentSelector* currentInstance() { return s_currentInstance; }
    5956
    … …  
    6158    ShadowContentSelector* m_parent;
    6259    ShadowRoot* m_shadowRoot;
    63     ShadowContentElement* m_activeElement;
    6460    Vector<RefPtr<Node> > m_children;
    6561

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

    r90987 r91235  
    3131#include "Document.h"
    3232#include "NodeRareData.h"
     33#include "ShadowContentElement.h"
    3334#include "ShadowContentSelector.h"
    3435
    … …  
    5051ShadowRoot::~ShadowRoot()
    5152{
     53    ASSERT(!m_inclusions || m_inclusions->isEmpty());
    5254}
    5355
    … …  
    9698}
    9799
    98 ShadowContentElement* ShadowRoot::activeContentElement()
     100ShadowContentElement* ShadowRoot::includerFor(Node* node) const
    99101{
    100     ShadowContentSelector* selector = ShadowContentSelector::currentInstance();
    101     if (!selector || selector->shadowRoot() != this)
     102    if (!m_inclusions)
    102103        return 0;
    103     return selector->activeElement();
     104    ShadowInclusion* found = m_inclusions->find(node);
     105    if (!found)
     106        return 0;
     107    return found->includer();
    104108}
    105109
    … …  
    138142}
    139143
     144ShadowInclusionSet* ShadowRoot::inclusions() const
     145{
     146    return m_inclusions.get();
    140147}
     148
     149ShadowInclusionSet* ShadowRoot::ensureInclusions()
     150{
     151    if (!m_inclusions)
     152        m_inclusions = adoptPtr(new ShadowInclusionSet());
     153    return m_inclusions.get();
     154}
     155
     156
     157}

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

    r90987 r91235  
    3434class Document;
    3535class ShadowContentElement;
     36class ShadowInclusionSet;
    3637
    3738class ShadowRoot : public TreeScope {
    … …  
    4142    virtual void recalcStyle(StyleChange = NoChange);
    4243
    43     ShadowContentElement* activeContentElement();
     44    ShadowContentElement* includerFor(Node*) const;
    4445    void hostChildrenChanged();
    4546
    … …  
    4849    virtual bool applyAuthorSheets() const;
    4950    void setApplyAuthorSheets(bool);
     51
     52    ShadowInclusionSet* inclusions() const;
     53    ShadowInclusionSet* ensureInclusions();
    5054
    5155private:
    … …  
    6165
    6266    bool m_applyAuthorSheets;
     67    OwnPtr<ShadowInclusionSet> m_inclusions;
    6368};
    6469
    … …  
    6873}
    6974
     75inline ShadowRoot* toShadowRoot(Node* node)
     76{
     77    ASSERT(!node || node->nodeType() == Node::SHADOW_ROOT_NODE);
     78    return static_cast<ShadowRoot*>(node);
     79}
     80
    7081} // namespace
    7182

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

    r90987 r91235  
    3232#include "ExceptionCode.h"
    3333#include "InspectorController.h"
     34#include "NodeRenderingContext.h"
    3435#include "Page.h"
    3536#include "RenderTreeAsText.h"
    … …  
    116117}
    117118
     119Element* Internals::includerFor(Node* node, ExceptionCode& ec)
     120{
     121    if (!node) {
     122        ec = INVALID_ACCESS_ERR;
     123        return 0;
     124    }
     125
     126    return NodeRenderingContext(node).includer();
     127}
     128
    118129String Internals::shadowPseudoId(Element* element, ExceptionCode& ec)
    119130{

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

    r90987 r91235  
    5151    Node* shadowRoot(Element* host, ExceptionCode&);
    5252    void removeShadowRoot(Element* host, ExceptionCode&);
     53    Element* includerFor(Node*, ExceptionCode&);
    5354    String shadowPseudoId(Element*, ExceptionCode&);
    5455    PassRefPtr<Element> createShadowContentElement(Document*, ExceptionCode&);

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

    r90987 r91235  
    3333        Node ensureShadowRoot(in Element host) raises (DOMException);
    3434        Node shadowRoot(in Element host) raises (DOMException);
     35        Element includerFor(in Node node) raises (DOMException);
    3536        void removeShadowRoot(in Element host) raises (DOMException);
    3637        DOMString shadowPseudoId(in Element element) raises (DOMException);

  • trunk/Source/WebKit2/ChangeLog

    r91232 r91235  
     12011-07-18  MORITA Hajime  <morrita@google.com>
     2
     3        [ShadowContentElement] forwarded node should be able to access its hosting content element.
     4        https://bugs.webkit.org/show_bug.cgi?id=64251
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Exported additional symbols for window.internals object.
     9
     10        * win/WebKit2.def:
     11        * win/WebKit2CFLite.def:
     12
    1132011-07-18  Dean Jackson  <dino@apple.com>
    214

  • trunk/Source/WebKit2/win/WebKit2.def

    r90987 r91235  
    136136
    137137        ; Re-exports from WebCore for test harnesses
     138        ??0NodeRenderingContext@WebCore@@QAE@PAVNode@1@@Z
     139        ??1NodeRenderingContext@WebCore@@QAE@XZ
     140        ?toNode@WebCore@@YAPAVNode@1@VJSValue@JSC@@@Z
    138141        ??0String@WTF@@QAE@PBD@Z
    139142        ??0String@WTF@@QAE@PB_W@Z

  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r90987 r91235  
    129129
    130130        ; Re-exports from WebCore for test harnesses
     131        ??0NodeRenderingContext@WebCore@@QAE@PAVNode@1@@Z
    131132        ??0String@WTF@@QAE@PBD@Z
    132133        ??0String@WTF@@QAE@PB_W@Z
     134        ??1NodeRenderingContext@WebCore@@QAE@XZ
    133135        ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBD@Z
    134136        ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z
    … …  
    149151        ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
    150152        ?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
     153        ?toNode@WebCore@@YAPAVNode@1@VJSValue@JSC@@@Z
    151154        ?virtualFunctionToPreventWeakVtable@JSDOMWrapper@WebCore@@MAEXXZ

  • trunk/Source/autotools/symbols.filter

    r90987 r91235  
    3838_ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE;
    3939_ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii;
     40_ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE;
     41_ZN7WebCore20NodeRenderingContextD1Ev;
    4042_ZN7WebCore20ShadowContentElement6createEPNS_8DocumentE;
    4143_ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE;
    … …  
    4446_ZN7WebCore6JSNode3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE;
    4547_ZN7WebCore6JSNode6s_infoE;
     48_ZN7WebCore6toNodeEN3JSC7JSValueE;
    4649_ZN7WebCore7Element16ensureShadowRootEv;
    4750_ZN7WebCore7Element16removeShadowRootEv;
Note: See TracChangeset for help on using the changeset viewer.