Changeset 166459 in webkit


Ignore:
Timestamp:
Mar 29, 2014 11:01:08 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r166434.
​https://bugs.webkit.org/show_bug.cgi?id=130938

Caused crashes and other failures on cache tests (Requested by
ap on #webkit).

Reverted changeset:

Source/WebCore:

"Web Replay: add page-level setting to bypass the MemoryCache"
​https://bugs.webkit.org/show_bug.cgi?id=130728
​http://trac.webkit.org/changeset/166434

Source/WebKit2:

"Web Replay: add page-level setting to bypass the MemoryCache"
​https://bugs.webkit.org/show_bug.cgi?id=130728
​http://trac.webkit.org/changeset/166434

LayoutTests:

"Web Replay: add page-level setting to bypass the MemoryCache"
​https://bugs.webkit.org/show_bug.cgi?id=130728
​http://trac.webkit.org/changeset/166434

Location:
trunk
Files:
3 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r166457 r166459  
     12014-03-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r166434.
     4        https://bugs.webkit.org/show_bug.cgi?id=130938
     5
     6        Caused crashes and other failures on cache tests (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Replay: add page-level setting to bypass the MemoryCache"
     12        https://bugs.webkit.org/show_bug.cgi?id=130728
     13        http://trac.webkit.org/changeset/166434
     14
    1152014-03-29  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebCore/ChangeLog

    r166457 r166459  
     12014-03-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r166434.
     4        https://bugs.webkit.org/show_bug.cgi?id=130938
     5
     6        Caused crashes and other failures on cache tests (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Replay: add page-level setting to bypass the MemoryCache"
     12        https://bugs.webkit.org/show_bug.cgi?id=130728
     13        http://trac.webkit.org/changeset/166434
     14
    1152014-03-29  David Kilzer  <ddkilzer@apple.com>
    216

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r166434 r166459  
    485485
    486486    ASSERT(resource->url() == url.string());
    487 
    488     if (sessionID() != SessionID::bypassCacheSessionID())
    489         m_documentResources.set(resource->url(), resource);
    490 
     487    m_documentResources.set(resource->url(), resource);
    491488    return resource;
    492489}
    … …  
    500497    ASSERT(!resource->resourceToRevalidate());
    501498    ASSERT(resource->sessionID() == sessionID());
    502     ASSERT(sessionID() != SessionID::bypassCacheSessionID());
    503499
    504500    // Copy the URL out of the resource to be revalidated in case it gets deleted by the remove() call below.

  • trunk/Source/WebCore/loader/cache/MemoryCache.cpp

    r166434 r166459  
    111111        return false;
    112112
    113     if (resource->sessionID() == SessionID::bypassCacheSessionID())
    114         return false;
    115 
    116113    ASSERT(WTF::isMainThread());
    117114

  • trunk/Source/WebCore/page/Page.cpp

    r166434 r166459  
    15211521        return SessionID::legacyPrivateSessionID();
    15221522
    1523     if (!settings().usesMemoryCache())
    1524         return SessionID::bypassCacheSessionID();
    1525 
    15261523    return SessionID::defaultSessionID();
    15271524}

  • trunk/Source/WebCore/page/SessionID.h

    r166434 r166459  
    4444    static SessionID defaultSessionID() { return SessionID(1); }
    4545    static SessionID legacyPrivateSessionID() { return SessionID(2); }
    46     static SessionID bypassCacheSessionID() { return SessionID(3); }
    4746private:
    4847    uint64_t m_sessionID;

  • trunk/Source/WebCore/page/Settings.cpp

    r166434 r166459  
    178178    , m_needsAdobeFrameReloadingQuirk(false)
    179179    , m_usesPageCache(false)
    180     , m_usesMemoryCache(true)
    181180    , m_fontRenderingMode(0)
    182181    , m_showTiledScrollingIndicator(false)

  • trunk/Source/WebCore/page/Settings.h

    r166434 r166459  
    182182    void setUsesPageCache(bool);
    183183    bool usesPageCache() const { return m_usesPageCache; }
    184 
    185     void setUsesMemoryCache(bool usesMemoryCache) { m_usesMemoryCache = usesMemoryCache; }
    186     bool usesMemoryCache() const { return m_usesMemoryCache; }
    187 
     184       
    188185    void setFontRenderingMode(FontRenderingMode mode);
    189186    FontRenderingMode fontRenderingMode() const;
    … …  
    311308    bool m_needsAdobeFrameReloadingQuirk : 1;
    312309    bool m_usesPageCache : 1;
    313     bool m_usesMemoryCache : 1;
    314310    unsigned m_fontRenderingMode : 1;
    315311    bool m_showTiledScrollingIndicator : 1;

  • trunk/Source/WebCore/replay/ReplayController.cpp

    r166434 r166459  
    7272
    7373    if (shouldForce) {
    74         m_savedSettings.usesMemoryCache = m_page.settings().usesMemoryCache();
    7574        m_savedSettings.usesPageCache = m_page.settings().usesPageCache();
    7675
    77         m_page.settings().setUsesMemoryCache(false);
    7876        m_page.settings().setUsesPageCache(false);
    7977    } else {
    80         m_page.settings().setUsesMemoryCache(m_savedSettings.usesMemoryCache);
    8178        m_page.settings().setUsesPageCache(m_savedSettings.usesPageCache);
    8279    }

  • trunk/Source/WebCore/replay/ReplayController.h

    r166434 r166459  
    155155
    156156    struct SavedSettings {
    157         bool usesMemoryCache;
    158157        bool usesPageCache;
    159158
    160159        SavedSettings()
    161             : usesMemoryCache(true)
    162             , usesPageCache(false)
     160            : usesPageCache(false)
    163161        { }
    164162    };

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

    r166434 r166459  
    9292    , m_pluginReplacementEnabled(RuntimeEnabledFeatures::sharedFeatures().pluginReplacementEnabled())
    9393    , m_shouldConvertPositionStyleOnCopy(settings.shouldConvertPositionStyleOnCopy())
    94     , m_usesMemoryCache(settings.usesMemoryCache())
    9594{
    9695}
    … …  
    151150    settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
    152151    settings.setShouldConvertPositionStyleOnCopy(m_shouldConvertPositionStyleOnCopy);
    153     settings.setUsesMemoryCache(m_usesMemoryCache);
    154152    RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
    155153}
    … …  
    496494}
    497495
    498 void InternalSettings::setUsesMemoryCache(bool usesMemoryCache, ExceptionCode& ec)
    499 {
    500     InternalSettingsGuardForSettings();
    501     settings()->setUsesMemoryCache(usesMemoryCache);
    502 }
    503 
    504 }
     496}

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

    r166434 r166459  
    8989        bool m_pluginReplacementEnabled;
    9090        bool m_shouldConvertPositionStyleOnCopy;
    91         bool m_usesMemoryCache;
    9291    };
    9392
    … …  
    134133    void setBackgroundShouldExtendBeyondPage(bool hasExtendedBackground, ExceptionCode&);
    135134    void setShouldConvertPositionStyleOnCopy(bool convert, ExceptionCode&);
    136     void setUsesMemoryCache(bool usesMemoryCache, ExceptionCode&);
     135
    137136
    138137private:

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

    r166434 r166459  
    6060    [RaisesException] void setBackgroundShouldExtendBeyondPage(boolean hasExtendedBackground);
    6161    [RaisesException] void setShouldConvertPositionStyleOnCopy(boolean convert);
    62     [RaisesException] void setUsesMemoryCache(boolean usesMemoryCache);
    6362};

  • trunk/Source/WebKit2/ChangeLog

    r166453 r166459  
     12014-03-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r166434.
     4        https://bugs.webkit.org/show_bug.cgi?id=130938
     5
     6        Caused crashes and other failures on cache tests (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Replay: add page-level setting to bypass the MemoryCache"
     12        https://bugs.webkit.org/show_bug.cgi?id=130728
     13        http://trac.webkit.org/changeset/166434
     14
    1152014-03-28  Anders Carlsson  <andersca@apple.com>
    216

  • trunk/Source/WebKit2/UIProcess/APISession.cpp

    r166434 r166459  
    3535    ASSERT(RunLoop::isMain());
    3636
    37     static uint64_t uniqueSessionID = WebCore::SessionID::bypassCacheSessionID().sessionID();
     37    static uint64_t uniqueSessionID = WebCore::SessionID::legacyPrivateSessionID().sessionID();
    3838    ASSERT_UNUSED(isEphemeral, isEphemeral);
    3939    return ++uniqueSessionID;
Note: See TracChangeset for help on using the changeset viewer.