Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2013 Google Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/html/parser/HTMLResourcePreloader.h" | 27 #include "core/html/parser/HTMLResourcePreloader.h" |
| 28 | 28 |
| 29 #include "core/css/MediaList.h" | |
| 30 #include "core/css/MediaQueryEvaluator.h" | |
| 29 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/html/HTMLImport.h" | |
| 30 #include "core/loader/cache/CachedResourceInitiatorInfo.h" | 33 #include "core/loader/cache/CachedResourceInitiatorInfo.h" |
| 31 #include "core/loader/cache/CachedResourceLoader.h" | 34 #include "core/loader/cache/CachedResourceLoader.h" |
| 32 | |
| 33 #include "core/css/MediaList.h" | |
| 34 #include "core/css/MediaQueryEvaluator.h" | |
| 35 #include "core/rendering/RenderObject.h" | 35 #include "core/rendering/RenderObject.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 bool PreloadRequest::isSafeToSendToAnotherThread() const | 39 bool PreloadRequest::isSafeToSendToAnotherThread() const |
| 40 { | 40 { |
| 41 return m_initiatorName.isSafeToSendToAnotherThread() | 41 return m_initiatorName.isSafeToSendToAnotherThread() |
| 42 && m_charset.isSafeToSendToAnotherThread() | 42 && m_charset.isSafeToSendToAnotherThread() |
| 43 && m_resourceURL.isSafeToSendToAnotherThread() | 43 && m_resourceURL.isSafeToSendToAnotherThread() |
| 44 && m_mediaAttribute.isSafeToSendToAnotherThread() | 44 && m_mediaAttribute.isSafeToSendToAnotherThread() |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 75 | 75 |
| 76 static bool mediaAttributeMatches(Frame* frame, RenderStyle* renderStyle, const String& attributeValue) | 76 static bool mediaAttributeMatches(Frame* frame, RenderStyle* renderStyle, const String& attributeValue) |
| 77 { | 77 { |
| 78 RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::create(attributeValue); | 78 RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::create(attributeValue); |
| 79 MediaQueryEvaluator mediaQueryEvaluator("screen", frame, renderStyle); | 79 MediaQueryEvaluator mediaQueryEvaluator("screen", frame, renderStyle); |
| 80 return mediaQueryEvaluator.eval(mediaQueries.get()); | 80 return mediaQueryEvaluator.eval(mediaQueries.get()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) | 83 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) |
| 84 { | 84 { |
| 85 ASSERT(m_document->frame()); | 85 Document* executingDocument = m_document->import() ? m_document->import()->m aster() : m_document; |
|
abarth-chromium
2013/07/19 07:55:55
What if the document that's imported itself import
| |
| 86 ASSERT(m_document->renderer()); | 86 Document* loadingDocument = m_document; |
| 87 ASSERT(m_document->renderer()->style()); | 87 |
| 88 if (!preload->media().isEmpty() && !mediaAttributeMatches(m_document->frame( ), m_document->renderer()->style(), preload->media())) | 88 ASSERT(executingDocument->frame()); |
| 89 ASSERT(executingDocument->renderer()); | |
| 90 ASSERT(executingDocument->renderer()->style()); | |
| 91 if (!preload->media().isEmpty() && !mediaAttributeMatches(executingDocument- >frame(), executingDocument->renderer()->style(), preload->media())) | |
| 89 return; | 92 return; |
| 90 | 93 |
| 91 CachedResourceRequest request = preload->resourceRequest(m_document); | 94 CachedResourceRequest request = preload->resourceRequest(loadingDocument); |
| 92 m_document->cachedResourceLoader()->preload(preload->resourceType(), request , preload->charset()); | 95 loadingDocument->cachedResourceLoader()->preload(preload->resourceType(), re quest, preload->charset()); |
| 93 } | 96 } |
| 94 | 97 |
| 95 | 98 |
| 96 } | 99 } |
| OLD | NEW |