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

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

Issue 211363004: [Refactring] Turn HTMLImport::m_sync from bool to an enum. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed the default parameter 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/HTMLImportChild.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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 for (size_t i = 0; i < m_imports.size(); ++i) 64 for (size_t i = 0; i < m_imports.size(); ++i)
65 m_imports[i]->importDestroyed(); 65 m_imports[i]->importDestroyed();
66 if (m_master) 66 if (m_master)
67 m_master->setImport(0); 67 m_master->setImport(0);
68 m_master = 0; 68 m_master = 0;
69 m_recalcTimer.stop(); 69 m_recalcTimer.stop();
70 } 70 }
71 71
72 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client) 72 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client)
73 { 73 {
74 OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url , client->isSync())); 74 OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url , client->isSync() ? HTMLImport::Sync : HTMLImport::Async));
75 loader->setClient(client); 75 loader->setClient(client);
76 parent->appendChild(loader.get()); 76 parent->appendChild(loader.get());
77 m_imports.append(loader.release()); 77 m_imports.append(loader.release());
78 return m_imports.last().get(); 78 return m_imports.last().get();
79 } 79 }
80 80
81 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild Client* client, FetchRequest request) 81 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild Client* client, FetchRequest request)
82 { 82 {
83 ASSERT(!request.url().isEmpty() && request.url().isValid()); 83 ASSERT(!request.url().isEmpty() && request.url().isValid());
84 84
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 { 176 {
177 ASSERT(m_master); 177 ASSERT(m_master);
178 178
179 do { 179 do {
180 m_recalcTimer.stop(); 180 m_recalcTimer.stop();
181 HTMLImport::recalcTreeState(this); 181 HTMLImport::recalcTreeState(this);
182 } while (m_recalcTimer.isActive()); 182 } while (m_recalcTimer.isActive());
183 } 183 }
184 184
185 } // namespace WebCore 185 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/imports/HTMLImportChild.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698