diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/rendering/style/ContentData.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/rendering/style/ContentData.cpp')
| -rw-r--r-- | Source/WebCore/rendering/style/ContentData.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/style/ContentData.cpp b/Source/WebCore/rendering/style/ContentData.cpp index d150f77..ab504fd 100644 --- a/Source/WebCore/rendering/style/ContentData.cpp +++ b/Source/WebCore/rendering/style/ContentData.cpp @@ -51,6 +51,8 @@ bool ContentData::dataEquivalent(const ContentData& other) const return StyleImage::imagesEquivalent(image(), other.image()); case CONTENT_COUNTER: return *counter() == *other.counter(); + case CONTENT_QUOTE: + return quote() == other.quote(); } ASSERT_NOT_REACHED(); @@ -71,6 +73,8 @@ void ContentData::deleteContent() case CONTENT_COUNTER: delete m_content.m_counter; break; + case CONTENT_QUOTE: + break; } m_type = CONTENT_NONE; |