Changeset 208200 in webkit


Ignore:
Timestamp:
Oct 31, 2016 5:27:28 PM (7 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r207967.

This change seems to be the cause of at least one LayoutTest
becoming flaky.

Reverted changeset:

"REGRESSION(r207753-207755): ASSERTION FAILED:
m_parsedStyleSheetCache->isInMemoryCache()"
https://bugs.webkit.org/show_bug.cgi?id=163905
http://trac.webkit.org/changeset/207967

Location:
trunk
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r208199 r208200  
     12016-10-31  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207967.
     4
     5        This change seems to be the cause of at least one LayoutTest
     6        becoming flaky.
     7
     8        Reverted changeset:
     9
     10        "REGRESSION(r207753-207755): ASSERTION FAILED:
     11        m_parsedStyleSheetCache->isInMemoryCache()"
     12        https://bugs.webkit.org/show_bug.cgi?id=163905
     13        http://trac.webkit.org/changeset/207967
     14
    1152016-10-31  Joseph Pecoraro  <pecoraro@apple.com>
    216
  • trunk/Source/WebCore/ChangeLog

    r208199 r208200  
     12016-10-31  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r207967.
     4
     5        This change seems to be the cause of at least one LayoutTest
     6        becoming flaky.
     7
     8        Reverted changeset:
     9
     10        "REGRESSION(r207753-207755): ASSERTION FAILED:
     11        m_parsedStyleSheetCache->isInMemoryCache()"
     12        https://bugs.webkit.org/show_bug.cgi?id=163905
     13        http://trac.webkit.org/changeset/207967
     14
    1152016-10-31  Joseph Pecoraro  <pecoraro@apple.com>
    216
  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r207967 r208200  
    6464    , m_originalURL(originalURL)
    6565    , m_defaultNamespace(starAtom)
     66    , m_loadCompleted(false)
    6667    , m_isUserStyleSheet(ownerRule && ownerRule->parentStyleSheet() && ownerRule->parentStyleSheet()->isUserStyleSheet())
     68    , m_hasSyntacticallyValidCSSHeader(true)
     69    , m_didLoadErrorOccur(false)
     70    , m_usesStyleBasedEditability(false)
     71    , m_isMutable(false)
     72    , m_isInMemoryCache(false)
    6773    , m_parserContext(context)
    6874{
     
    7985    , m_namespaces(o.m_namespaces)
    8086    , m_defaultNamespace(o.m_defaultNamespace)
     87    , m_loadCompleted(true)
    8188    , m_isUserStyleSheet(o.m_isUserStyleSheet)
    82     , m_loadCompleted(true)
    8389    , m_hasSyntacticallyValidCSSHeader(o.m_hasSyntacticallyValidCSSHeader)
     90    , m_didLoadErrorOccur(false)
    8491    , m_usesStyleBasedEditability(o.m_usesStyleBasedEditability)
     92    , m_isMutable(false)
     93    , m_isInMemoryCache(false)
    8594    , m_parserContext(o.m_parserContext)
    8695{
     
    524533void StyleSheetContents::addedToMemoryCache()
    525534{
     535    ASSERT(!m_isInMemoryCache);
    526536    ASSERT(isCacheable());
    527     ++m_inMemoryCacheCount;
     537    m_isInMemoryCache = true;
    528538}
    529539
    530540void StyleSheetContents::removedFromMemoryCache()
    531541{
    532     ASSERT(m_inMemoryCacheCount);
     542    ASSERT(m_isInMemoryCache);
    533543    ASSERT(isCacheable());
    534     --m_inMemoryCacheCount;
     544    m_isInMemoryCache = false;
    535545}
    536546
  • trunk/Source/WebCore/css/StyleSheetContents.h

    r207967 r208200  
    139139    void setMutable() { m_isMutable = true; }
    140140
    141     bool isInMemoryCache() const { return m_inMemoryCacheCount; }
     141    bool isInMemoryCache() const { return m_isInMemoryCache; }
    142142    void addedToMemoryCache();
    143143    void removedFromMemoryCache();
     
    163163    AtomicString m_defaultNamespace;
    164164
    165     bool m_isUserStyleSheet;
    166     bool m_loadCompleted { false };
    167     bool m_hasSyntacticallyValidCSSHeader { true };
    168     bool m_didLoadErrorOccur { false };
    169     bool m_usesStyleBasedEditability { false };
    170     bool m_isMutable { false };
    171     unsigned m_inMemoryCacheCount { 0 };
    172 
     165    bool m_loadCompleted : 1;
     166    bool m_isUserStyleSheet : 1;
     167    bool m_hasSyntacticallyValidCSSHeader : 1;
     168    bool m_didLoadErrorOccur : 1;
     169    bool m_usesStyleBasedEditability : 1;
     170    bool m_isMutable : 1;
     171    bool m_isInMemoryCache : 1;
     172   
    173173    CSSParserContext m_parserContext;
    174174
  • trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp

    r208102 r208200  
    9797    m_decoder = sheet.m_decoder;
    9898    m_decodedSheetText = sheet.m_decodedSheetText;
    99     if (sheet.m_parsedStyleSheetCache)
    100         saveParsedStyleSheet(*sheet.m_parsedStyleSheetCache);
     99    m_parsedStyleSheetCache = sheet.m_parsedStyleSheetCache;
    101100}
    102101
Note: See TracChangeset for help on using the changeset viewer.