diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-21 05:19:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-21 05:19:53 -0700 |
| commit | 4c2ecd9da16e679f4adab1e95d711db78591c1e5 (patch) | |
| tree | d4434d49a7c9442a99135b538d628dfba0c55e30 /WebCore/loader/CachedResource.cpp | |
| parent | 320d49d8900163ea450b99f106701a3455fb1bb6 (diff) | |
| parent | 77ce2a099dc13c4d5496fbd4e2fe441c15a51308 (diff) | |
| download | external_webkit-4c2ecd9da16e679f4adab1e95d711db78591c1e5.zip external_webkit-4c2ecd9da16e679f4adab1e95d711db78591c1e5.tar.gz external_webkit-4c2ecd9da16e679f4adab1e95d711db78591c1e5.tar.bz2 | |
Merge "Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651 because it fixes http://b/issue?id=2838936, but includes more refactoring than my original fix at https://android-git.corp.google.com/g/#change,58175"
Diffstat (limited to 'WebCore/loader/CachedResource.cpp')
| -rw-r--r-- | WebCore/loader/CachedResource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/CachedResource.cpp index bde5da5..887b0b5 100644 --- a/WebCore/loader/CachedResource.cpp +++ b/WebCore/loader/CachedResource.cpp @@ -102,7 +102,7 @@ CachedResource::~CachedResource() if (m_docLoader) m_docLoader->removeCachedResource(this); } - + void CachedResource::load(DocLoader* docLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks) { m_sendResourceLoadCallbacks = sendResourceLoadCallbacks; |