diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/history/PageCache.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/history/PageCache.cpp')
-rw-r--r-- | Source/WebCore/history/PageCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/history/PageCache.cpp b/Source/WebCore/history/PageCache.cpp index a5dfb1e..d57df65 100644 --- a/Source/WebCore/history/PageCache.cpp +++ b/Source/WebCore/history/PageCache.cpp @@ -111,7 +111,7 @@ static bool logCanCacheFrameDecision(Frame* frame, int indentLevel) PCLOG(" -Frame contains plugins"); cannotCache = true; } - if (frame->loader()->url().protocolIs("https")) { + if (frame->document()->url().protocolIs("https")) { PCLOG(" -Frame is HTTPS"); cannotCache = true; } @@ -260,7 +260,7 @@ bool PageCache::canCachePageContainingThisFrame(Frame* frame) // they would need to be destroyed and then recreated, and there is no way that we can recreate // the right NPObjects. See <rdar://problem/5197041> for more information. && !frame->loader()->subframeLoader()->containsPlugins() - && !frame->loader()->url().protocolIs("https") + && !frame->document()->url().protocolIs("https") && (!frame->domWindow() || !frame->domWindow()->hasEventListeners(eventNames().unloadEvent)) #if ENABLE(DATABASE) && !frame->document()->hasOpenDatabases() |