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

Side by Side Diff: Source/core/html/imports/HTMLImportsController.cpp

Issue 183883004: Let ContentSecurityPolicy shared between imports and the master. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Adding guardRef()/guardDeref() Created 6 years, 9 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/html/imports/HTMLImportLoader.cpp ('k') | no next file » | 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 { 62 {
63 for (size_t i = 0; i < m_imports.size(); ++i) 63 for (size_t i = 0; i < m_imports.size(); ++i)
64 m_imports[i]->importDestroyed(); 64 m_imports[i]->importDestroyed();
65 if (m_master) 65 if (m_master)
66 m_master->setImport(0); 66 m_master->setImport(0);
67 m_master = 0; 67 m_master = 0;
68 } 68 }
69 69
70 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client) 70 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client)
71 { 71 {
72 OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(url, client->i sCreatedByParser())); 72 OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url , client->isCreatedByParser()));
73 loader->setClient(client); 73 loader->setClient(client);
74 parent->appendChild(loader.get()); 74 parent->appendChild(loader.get());
75 m_imports.append(loader.release()); 75 m_imports.append(loader.release());
76 return m_imports.last().get(); 76 return m_imports.last().get();
77 } 77 }
78 78
79 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild Client* client, FetchRequest request) 79 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild Client* client, FetchRequest request)
80 { 80 {
81 ASSERT(!request.url().isEmpty() && request.url().isValid()); 81 ASSERT(!request.url().isEmpty() && request.url().isValid());
82 82
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 void HTMLImportsController::recalcTimerFired(Timer<HTMLImportsController>*) 160 void HTMLImportsController::recalcTimerFired(Timer<HTMLImportsController>*)
161 { 161 {
162 do { 162 do {
163 m_recalcTimer.stop(); 163 m_recalcTimer.stop();
164 HTMLImport::recalcTreeState(this); 164 HTMLImport::recalcTreeState(this);
165 } while (m_recalcTimer.isActive()); 165 } while (m_recalcTimer.isActive());
166 } 166 }
167 167
168 } // namespace WebCore 168 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/imports/HTMLImportLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698