| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
| 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "sky/engine/core/fetch/FontResource.h" | 33 #include "sky/engine/core/fetch/FontResource.h" |
| 34 #include "sky/engine/core/fetch/ImageResource.h" | 34 #include "sky/engine/core/fetch/ImageResource.h" |
| 35 #include "sky/engine/core/fetch/MemoryCache.h" | 35 #include "sky/engine/core/fetch/MemoryCache.h" |
| 36 #include "sky/engine/core/fetch/RawResource.h" | 36 #include "sky/engine/core/fetch/RawResource.h" |
| 37 #include "sky/engine/core/fetch/ResourceLoader.h" | 37 #include "sky/engine/core/fetch/ResourceLoader.h" |
| 38 #include "sky/engine/core/fetch/ResourceLoaderSet.h" | 38 #include "sky/engine/core/fetch/ResourceLoaderSet.h" |
| 39 #include "sky/engine/core/frame/LocalDOMWindow.h" | 39 #include "sky/engine/core/frame/LocalDOMWindow.h" |
| 40 #include "sky/engine/core/frame/LocalFrame.h" | 40 #include "sky/engine/core/frame/LocalFrame.h" |
| 41 #include "sky/engine/core/frame/Settings.h" | 41 #include "sky/engine/core/frame/Settings.h" |
| 42 #include "sky/engine/core/html/HTMLElement.h" | 42 #include "sky/engine/core/html/HTMLElement.h" |
| 43 #include "sky/engine/core/html/imports/HTMLImportsController.h" | |
| 44 #include "sky/engine/core/inspector/ConsoleMessage.h" | 43 #include "sky/engine/core/inspector/ConsoleMessage.h" |
| 45 #include "sky/engine/core/loader/FrameLoaderClient.h" | 44 #include "sky/engine/core/loader/FrameLoaderClient.h" |
| 46 #include "sky/engine/core/loader/UniqueIdentifier.h" | 45 #include "sky/engine/core/loader/UniqueIdentifier.h" |
| 47 #include "sky/engine/core/page/Page.h" | 46 #include "sky/engine/core/page/Page.h" |
| 48 #include "sky/engine/platform/Logging.h" | 47 #include "sky/engine/platform/Logging.h" |
| 49 #include "sky/engine/platform/SharedBuffer.h" | 48 #include "sky/engine/platform/SharedBuffer.h" |
| 50 #include "sky/engine/platform/TraceEvent.h" | 49 #include "sky/engine/platform/TraceEvent.h" |
| 51 #include "sky/engine/platform/weborigin/SecurityPolicy.h" | 50 #include "sky/engine/platform/weborigin/SecurityPolicy.h" |
| 52 #include "sky/engine/public/platform/Platform.h" | 51 #include "sky/engine/public/platform/Platform.h" |
| 53 #include "sky/engine/public/platform/WebURL.h" | 52 #include "sky/engine/public/platform/WebURL.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 return m_documentResources.get(url).get(); | 157 return m_documentResources.get(url).get(); |
| 159 } | 158 } |
| 160 | 159 |
| 161 LocalFrame* ResourceFetcher::frame() const | 160 LocalFrame* ResourceFetcher::frame() const |
| 162 { | 161 { |
| 163 // FIXME(sky): This used to prefer DocumentLoader::frame | 162 // FIXME(sky): This used to prefer DocumentLoader::frame |
| 164 // over importsController->master()->frame(), but in our | 163 // over importsController->master()->frame(), but in our |
| 165 // world we should always just have one frame. | 164 // world we should always just have one frame. |
| 166 if (!m_document) | 165 if (!m_document) |
| 167 return 0; | 166 return 0; |
| 168 if (m_document->importsController()) | |
| 169 return m_document->importsController()->master()->frame(); | |
| 170 return m_document->frame(); | 167 return m_document->frame(); |
| 171 } | 168 } |
| 172 | 169 |
| 173 FetchContext& ResourceFetcher::context() const | 170 FetchContext& ResourceFetcher::context() const |
| 174 { | 171 { |
| 175 if (LocalFrame* frame = this->frame()) | 172 if (LocalFrame* frame = this->frame()) |
| 176 return frame->fetchContext(); | 173 return frame->fetchContext(); |
| 177 return FetchContext::nullInstance(); | 174 return FetchContext::nullInstance(); |
| 178 } | 175 } |
| 179 | 176 |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 case Revalidate: | 759 case Revalidate: |
| 763 ++m_revalidateCount; | 760 ++m_revalidateCount; |
| 764 return; | 761 return; |
| 765 case Use: | 762 case Use: |
| 766 ++m_useCount; | 763 ++m_useCount; |
| 767 return; | 764 return; |
| 768 } | 765 } |
| 769 } | 766 } |
| 770 | 767 |
| 771 } | 768 } |
| OLD | NEW |