Changeset 140383 in webkit


Ignore:
Timestamp:
Jan 21, 2013 10:02:03 PM (11 years ago)
Author:
akling@apple.com
Message:

CSSSelector::value() should assert that m_match != Tag.
<http://webkit.org/b/107500>

Reviewed by Anders Carlsson.

Add an assertion to catch anyone trying to extract a value() from a Tag selector.

  • css/CSSSelector.h:

(CSSSelector):
(WebCore::CSSSelector::value):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r140382 r140383  
     12013-01-21  Andreas Kling  <akling@apple.com>
     2
     3        CSSSelector::value() should assert that m_match != Tag.
     4        <http://webkit.org/b/107500>
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Add an assertion to catch anyone trying to extract a value() from a Tag selector.
     9
     10        * css/CSSSelector.h:
     11        (CSSSelector):
     12        (WebCore::CSSSelector::value):
     13
    1142013-01-21  Dimitri Glazkov  <dglazkov@chromium.org>
    215
  • trunk/Source/WebCore/css/CSSSelector.h

    r140371 r140383  
    202202
    203203        const QualifiedName& tagQName() const;
    204         // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
    205         // FIXME: Perhaps call sites could be changed to accept AtomicStringImpl?
    206         const AtomicString& value() const { return *reinterpret_cast<const AtomicString*>(m_hasRareData ? &m_data.m_rareData->m_value : &m_data.m_value); }
     204        const AtomicString& value() const;
    207205        const QualifiedName& attribute() const;
    208206        const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
     
    426424}
    427425
     426inline const AtomicString& CSSSelector::value() const
     427{
     428    ASSERT(m_match != Tag);
     429    // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
     430    // FIXME: Perhaps call sites could be changed to accept AtomicStringImpl?
     431    return *reinterpret_cast<const AtomicString*>(m_hasRareData ? &m_data.m_rareData->m_value : &m_data.m_value);
     432}
     433
     434
    428435} // namespace WebCore
    429436
Note: See TracChangeset for help on using the changeset viewer.