| 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 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/frame/UseCounter.h" | 37 #include "core/frame/UseCounter.h" |
| 38 #include "core/html/imports/HTMLImportChild.h" | 38 #include "core/html/imports/HTMLImportChild.h" |
| 39 #include "core/html/imports/HTMLImportChildClient.h" | 39 #include "core/html/imports/HTMLImportChildClient.h" |
| 40 #include "core/html/imports/HTMLImportLoader.h" | 40 #include "core/html/imports/HTMLImportLoader.h" |
| 41 #include "core/html/imports/HTMLImportTreeRoot.h" | 41 #include "core/html/imports/HTMLImportTreeRoot.h" |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 const char* HTMLImportsController::supplementName() | 45 const char* HTMLImportsController::supplementName() |
| 46 { | 46 { |
| 47 DEFINE_STATIC_LOCAL(const char*, name, ("HTMLImportsController")); | 47 return "HTMLImportsController"; |
| 48 return name; | |
| 49 } | 48 } |
| 50 | 49 |
| 51 void HTMLImportsController::provideTo(Document& master) | 50 void HTMLImportsController::provideTo(Document& master) |
| 52 { | 51 { |
| 53 OwnPtrWillBeRawPtr<HTMLImportsController> controller = adoptPtrWillBeNoop(ne
w HTMLImportsController(master)); | 52 OwnPtrWillBeRawPtr<HTMLImportsController> controller = adoptPtrWillBeNoop(ne
w HTMLImportsController(master)); |
| 54 master.setImportsController(controller.get()); | 53 master.setImportsController(controller.get()); |
| 55 DocumentSupplement::provideTo(master, supplementName(), controller.release()
); | 54 DocumentSupplement::provideTo(master, supplementName(), controller.release()
); |
| 56 } | 55 } |
| 57 | 56 |
| 58 void HTMLImportsController::removeFrom(Document& master) | 57 void HTMLImportsController::removeFrom(Document& master) |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 } | 177 } |
| 179 | 178 |
| 180 DEFINE_TRACE(HTMLImportsController) | 179 DEFINE_TRACE(HTMLImportsController) |
| 181 { | 180 { |
| 182 visitor->trace(m_root); | 181 visitor->trace(m_root); |
| 183 visitor->trace(m_loaders); | 182 visitor->trace(m_loaders); |
| 184 DocumentSupplement::trace(visitor); | 183 DocumentSupplement::trace(visitor); |
| 185 } | 184 } |
| 186 | 185 |
| 187 } // namespace blink | 186 } // namespace blink |
| OLD | NEW |