Diff
Modified: trunk/LayoutTests/ChangeLog (166458 => 166459)
--- trunk/LayoutTests/ChangeLog 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/LayoutTests/ChangeLog 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1,3 +1,17 @@
+2014-03-29 Commit Queue <commit-qu...@webkit.org>
+
+ 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:
+
+ "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
+
2014-03-29 David Kilzer <ddkil...@apple.com>
Preserve selection end positions in directionOfSelection
Deleted: trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload-expected.txt (166458 => 166459)
--- trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload-expected.txt 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload-expected.txt 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1,11 +0,0 @@
-http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html - didFinishLoading
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/random-cached.cgi, main document URL http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/random-cached.cgi, http status code 200>
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - didFinishLoading
-http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html, main document URL http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html, http status code 200>
-http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html - didFinishLoading
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/cache/resources/random-cached.cgi, main document URL http://127.0.0.1:8000/cache/bypass-memory-cache-after-reload.html, http method GET> redirectResponse (null)
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/cache/resources/random-cached.cgi, http status code 200>
-http://127.0.0.1:8000/cache/resources/random-cached.cgi - didFinishLoading
-FINISHED LOADING
Deleted: trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload.html (166458 => 166459)
--- trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload.html 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/LayoutTests/http/tests/cache/bypass-memory-cache-after-reload.html 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1,53 +0,0 @@
-<body>
-<h1></h1>
-<script>
-// Test that a subresource fetched after onload, following a reload, is
-// not cached if we configure the page's settings to bypass the memory cache.
-if (!sessionStorage.lastRandom) {
- if (window.testRunner && window.internals) {
- internals.settings.setUsesMemoryCache(false);
- testRunner.dumpResourceLoadCallbacks();
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-}
-
-function done(result)
-{
- delete sessionStorage.lastRandom;
-
- document.body.innerText = result;
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function scriptLoaded()
-{
- setTimeout(function()
- {
- if (!window.randomNumber)
- done('FAIL: window.randomNumber not defined!');
- else if (sessionStorage.lastRandom) {
- // We don't want to compare the actual random numbers because
- // the request may or may not be cached by the network stack.
- done('FINISHED LOADING');
- } else {
- sessionStorage.lastRandom = randomNumber;
- location.reload();
- }
- }, 0);
-}
-
-_onload_ = function()
-{
- setTimeout(function()
- {
- var s = document.createElement("script");
- s.src = ""
- s._onload_ = scriptLoaded;
- document.body.appendChild(s);
- }, 0);
-};
-</script>
-</body>
Modified: trunk/Source/WebCore/ChangeLog (166458 => 166459)
--- trunk/Source/WebCore/ChangeLog 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/ChangeLog 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1,3 +1,17 @@
+2014-03-29 Commit Queue <commit-qu...@webkit.org>
+
+ 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:
+
+ "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
+
2014-03-29 David Kilzer <ddkil...@apple.com>
Preserve selection end positions in directionOfSelection
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (166458 => 166459)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -484,10 +484,7 @@
m_validatedURLs.add(request.resourceRequest().url());
ASSERT(resource->url() == url.string());
-
- if (sessionID() != SessionID::bypassCacheSessionID())
- m_documentResources.set(resource->url(), resource);
-
+ m_documentResources.set(resource->url(), resource);
return resource;
}
@@ -499,7 +496,6 @@
ASSERT(resource->canUseCacheValidator());
ASSERT(!resource->resourceToRevalidate());
ASSERT(resource->sessionID() == sessionID());
- ASSERT(sessionID() != SessionID::bypassCacheSessionID());
// Copy the URL out of the resource to be revalidated in case it gets deleted by the remove() call below.
String url = ""
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (166458 => 166459)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -110,9 +110,6 @@
if (disabled())
return false;
- if (resource->sessionID() == SessionID::bypassCacheSessionID())
- return false;
-
ASSERT(WTF::isMainThread());
CachedResourceMap& resources = getSessionMap(resource->sessionID());
Modified: trunk/Source/WebCore/page/Page.cpp (166458 => 166459)
--- trunk/Source/WebCore/page/Page.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/page/Page.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1520,9 +1520,6 @@
if (settings().privateBrowsingEnabled())
return SessionID::legacyPrivateSessionID();
- if (!settings().usesMemoryCache())
- return SessionID::bypassCacheSessionID();
-
return SessionID::defaultSessionID();
}
Modified: trunk/Source/WebCore/page/SessionID.h (166458 => 166459)
--- trunk/Source/WebCore/page/SessionID.h 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/page/SessionID.h 2014-03-30 06:01:08 UTC (rev 166459)
@@ -43,7 +43,6 @@
static SessionID emptySessionID() { return SessionID(0); }
static SessionID defaultSessionID() { return SessionID(1); }
static SessionID legacyPrivateSessionID() { return SessionID(2); }
- static SessionID bypassCacheSessionID() { return SessionID(3); }
private:
uint64_t m_sessionID;
};
Modified: trunk/Source/WebCore/page/Settings.cpp (166458 => 166459)
--- trunk/Source/WebCore/page/Settings.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -177,7 +177,6 @@
, m_isScriptEnabled(false)
, m_needsAdobeFrameReloadingQuirk(false)
, m_usesPageCache(false)
- , m_usesMemoryCache(true)
, m_fontRenderingMode(0)
, m_showTiledScrollingIndicator(false)
, m_tiledBackingStoreEnabled(false)
Modified: trunk/Source/WebCore/page/Settings.h (166458 => 166459)
--- trunk/Source/WebCore/page/Settings.h 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/page/Settings.h 2014-03-30 06:01:08 UTC (rev 166459)
@@ -181,10 +181,7 @@
void setUsesPageCache(bool);
bool usesPageCache() const { return m_usesPageCache; }
-
- void setUsesMemoryCache(bool usesMemoryCache) { m_usesMemoryCache = usesMemoryCache; }
- bool usesMemoryCache() const { return m_usesMemoryCache; }
-
+
void setFontRenderingMode(FontRenderingMode mode);
FontRenderingMode fontRenderingMode() const;
@@ -310,7 +307,6 @@
bool m_isScriptEnabled : 1;
bool m_needsAdobeFrameReloadingQuirk : 1;
bool m_usesPageCache : 1;
- bool m_usesMemoryCache : 1;
unsigned m_fontRenderingMode : 1;
bool m_showTiledScrollingIndicator : 1;
bool m_tiledBackingStoreEnabled : 1;
Modified: trunk/Source/WebCore/replay/ReplayController.cpp (166458 => 166459)
--- trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -71,13 +71,10 @@
ASSERT(shouldForce ^ (m_sessionState == SessionState::Inactive));
if (shouldForce) {
- m_savedSettings.usesMemoryCache = m_page.settings().usesMemoryCache();
m_savedSettings.usesPageCache = m_page.settings().usesPageCache();
- m_page.settings().setUsesMemoryCache(false);
m_page.settings().setUsesPageCache(false);
} else {
- m_page.settings().setUsesMemoryCache(m_savedSettings.usesMemoryCache);
m_page.settings().setUsesPageCache(m_savedSettings.usesPageCache);
}
}
Modified: trunk/Source/WebCore/replay/ReplayController.h (166458 => 166459)
--- trunk/Source/WebCore/replay/ReplayController.h 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/replay/ReplayController.h 2014-03-30 06:01:08 UTC (rev 166459)
@@ -154,12 +154,10 @@
void setForceDeterministicSettings(bool);
struct SavedSettings {
- bool usesMemoryCache;
bool usesPageCache;
SavedSettings()
- : usesMemoryCache(true)
- , usesPageCache(false)
+ : usesPageCache(false)
{ }
};
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (166458 => 166459)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -91,7 +91,6 @@
, m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
, m_pluginReplacementEnabled(RuntimeEnabledFeatures::sharedFeatures().pluginReplacementEnabled())
, m_shouldConvertPositionStyleOnCopy(settings.shouldConvertPositionStyleOnCopy())
- , m_usesMemoryCache(settings.usesMemoryCache())
{
}
@@ -150,7 +149,6 @@
settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
settings.setAutoscrollForDragAndDropEnabled(m_autoscrollForDragAndDropEnabled);
settings.setShouldConvertPositionStyleOnCopy(m_shouldConvertPositionStyleOnCopy);
- settings.setUsesMemoryCache(m_usesMemoryCache);
RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
}
@@ -495,10 +493,4 @@
settings()->setShouldConvertPositionStyleOnCopy(convert);
}
-void InternalSettings::setUsesMemoryCache(bool usesMemoryCache, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setUsesMemoryCache(usesMemoryCache);
}
-
-}
Modified: trunk/Source/WebCore/testing/InternalSettings.h (166458 => 166459)
--- trunk/Source/WebCore/testing/InternalSettings.h 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2014-03-30 06:01:08 UTC (rev 166459)
@@ -88,7 +88,6 @@
bool m_autoscrollForDragAndDropEnabled;
bool m_pluginReplacementEnabled;
bool m_shouldConvertPositionStyleOnCopy;
- bool m_usesMemoryCache;
};
static PassRefPtr<InternalSettings> create(Page* page)
@@ -133,8 +132,8 @@
void setPluginReplacementEnabled(bool);
void setBackgroundShouldExtendBeyondPage(bool hasExtendedBackground, ExceptionCode&);
void setShouldConvertPositionStyleOnCopy(bool convert, ExceptionCode&);
- void setUsesMemoryCache(bool usesMemoryCache, ExceptionCode&);
+
private:
explicit InternalSettings(Page*);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (166458 => 166459)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2014-03-30 06:01:08 UTC (rev 166459)
@@ -59,5 +59,4 @@
void setPluginReplacementEnabled(boolean enabled);
[RaisesException] void setBackgroundShouldExtendBeyondPage(boolean hasExtendedBackground);
[RaisesException] void setShouldConvertPositionStyleOnCopy(boolean convert);
- [RaisesException] void setUsesMemoryCache(boolean usesMemoryCache);
};
Modified: trunk/Source/WebKit2/ChangeLog (166458 => 166459)
--- trunk/Source/WebKit2/ChangeLog 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-30 06:01:08 UTC (rev 166459)
@@ -1,3 +1,17 @@
+2014-03-29 Commit Queue <commit-qu...@webkit.org>
+
+ 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:
+
+ "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
+
2014-03-28 Anders Carlsson <ander...@apple.com>
Uncaught NSExceptions should crash the web process
Modified: trunk/Source/WebKit2/UIProcess/APISession.cpp (166458 => 166459)
--- trunk/Source/WebKit2/UIProcess/APISession.cpp 2014-03-30 05:57:40 UTC (rev 166458)
+++ trunk/Source/WebKit2/UIProcess/APISession.cpp 2014-03-30 06:01:08 UTC (rev 166459)
@@ -34,7 +34,7 @@
{
ASSERT(RunLoop::isMain());
- static uint64_t uniqueSessionID = WebCore::SessionID::bypassCacheSessionID().sessionID();
+ static uint64_t uniqueSessionID = WebCore::SessionID::legacyPrivateSessionID().sessionID();
ASSERT_UNUSED(isEphemeral, isEphemeral);
return ++uniqueSessionID;
}
