diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/rendering/RenderObjectChildList.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/rendering/RenderObjectChildList.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderObjectChildList.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp index 4df7180..617067a 100644 --- a/Source/WebCore/rendering/RenderObjectChildList.cpp +++ b/Source/WebCore/rendering/RenderObjectChildList.cpp @@ -262,31 +262,6 @@ static RenderObject* findBeforeAfterParent(RenderObject* object) return beforeAfterParent; } -static void invalidateCountersInContainer(RenderObject* container, const AtomicString& identifier) -{ - if (!container) - return; - container = findBeforeAfterParent(container); - if (!container) - return; - // Sometimes the counter is attached directly on the container. - if (container->isCounter()) { - toRenderCounter(container)->invalidate(identifier); - return; - } - for (RenderObject* content = container->firstChild(); content; content = content->nextSibling()) { - if (content->isCounter()) - toRenderCounter(content)->invalidate(identifier); - } -} - -void RenderObjectChildList::invalidateCounters(const RenderObject* owner, const AtomicString& identifier) -{ - ASSERT(!owner->documentBeingDestroyed()); - invalidateCountersInContainer(beforePseudoElementRenderer(owner), identifier); - invalidateCountersInContainer(afterPseudoElementRenderer(owner), identifier); -} - RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObject* owner) const { // An anonymous (generated) inline run-in that has PseudoId BEFORE must come from a grandparent. |