diff options
| author | Steve Block <steveblock@google.com> | 2011-09-26 13:12:35 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-09-26 22:52:08 +0100 |
| commit | 4cdf1c24e9a5622cded19588d9821f6c41b4d5a8 (patch) | |
| tree | 7f0e52c03f0b69b9e0fa508dffd769f4f44dfc19 /Source/WebCore/dom | |
| parent | b73d73df5423e237b8aafcbd60fdaf9e195243f8 (diff) | |
| download | external_webkit-4cdf1c24e9a5622cded19588d9821f6c41b4d5a8.zip external_webkit-4cdf1c24e9a5622cded19588d9821f6c41b4d5a8.tar.gz external_webkit-4cdf1c24e9a5622cded19588d9821f6c41b4d5a8.tar.bz2 | |
Add temporary work-around to allow loading local data from Documents with substituted data
This is a temporary workaround for a WebCore bug which is awaiting resolution.
See https://bugs.webkit.org/show_bug.cgi?id=68711 and this bug for details.
This change adds a new property to Frame to track when its Document pointer is
up-to-date. This is is used only when setting up the securty context for a
Document with substituted data and allows us to skip the buggy check in
Document::loader().
Bug: 5188895
Change-Id: I5d7d2cca83fa0c6db084d505f5b48207046a9cd0
Diffstat (limited to 'Source/WebCore/dom')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index c8bf374..d85a949 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -5070,7 +5070,13 @@ DocumentLoader* Document::loader() const if (!loader) return 0; - if (m_frame->document() != this) +#if PLATFORM(ANDROID) + // Temporary hack for http://b/5188895 + bool isDocumentUpToDate = m_frame->isDocumentUpToDate(); +#else + bool isDocumentUpToDate = true; +#endif + if (isDocumentUpToDate && m_frame->document() != this) return 0; return loader; |