Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Side by Side Diff: Source/core/html/LinkResource.cpp

Issue 305743003: HTMLImportsController does not need to hold Document ptr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 { 48 {
49 } 49 }
50 50
51 bool LinkResource::shouldLoadResource() const 51 bool LinkResource::shouldLoadResource() const
52 { 52 {
53 return m_owner->document().frame() || m_owner->document().importsController( ); 53 return m_owner->document().frame() || m_owner->document().importsController( );
54 } 54 }
55 55
56 LocalFrame* LinkResource::loadingFrame() const 56 LocalFrame* LinkResource::loadingFrame() const
57 { 57 {
58 HTMLImportsController* import = m_owner->document().importsController(); 58 HTMLImportsController* importsController = m_owner->document().importsContro ller();
59 if (!import) 59 if (!importsController)
60 return m_owner->document().frame(); 60 return m_owner->document().frame();
61 return import->frame(); 61 return importsController->master()->frame();
62 } 62 }
63 63
64 void LinkResource::trace(Visitor* visitor) 64 void LinkResource::trace(Visitor* visitor)
65 { 65 {
66 visitor->trace(m_owner); 66 visitor->trace(m_owner);
67 } 67 }
68 68
69 LinkRequestBuilder::LinkRequestBuilder(HTMLLinkElement* owner) 69 LinkRequestBuilder::LinkRequestBuilder(HTMLLinkElement* owner)
70 : m_owner(owner) 70 : m_owner(owner)
71 , m_url(owner->getNonEmptyURLAttribute(hrefAttr)) 71 , m_url(owner->getNonEmptyURLAttribute(hrefAttr))
72 { 72 {
73 m_charset = m_owner->getAttribute(charsetAttr); 73 m_charset = m_owner->getAttribute(charsetAttr);
74 if (m_charset.isEmpty() && m_owner->document().frame()) 74 if (m_charset.isEmpty() && m_owner->document().frame())
75 m_charset = m_owner->document().charset(); 75 m_charset = m_owner->document().charset();
76 } 76 }
77 77
78 FetchRequest LinkRequestBuilder::build(bool blocking) const 78 FetchRequest LinkRequestBuilder::build(bool blocking) const
79 { 79 {
80 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow; 80 ResourceLoadPriority priority = blocking ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;
81 return FetchRequest(ResourceRequest(m_owner->document().completeURL(m_url)), m_owner->localName(), m_charset, priority); 81 return FetchRequest(ResourceRequest(m_owner->document().completeURL(m_url)), m_owner->localName(), m_charset, priority);
82 } 82 }
83 83
84 } // namespace WebCore 84 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698