| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 #include "core/dom/Element.h" | 29 #include "core/dom/Element.h" |
| 30 #include "core/fetch/ScriptResource.h" | 30 #include "core/fetch/ScriptResource.h" |
| 31 | 31 |
| 32 namespace WebCore { | 32 namespace WebCore { |
| 33 | 33 |
| 34 PendingScript::~PendingScript() | 34 PendingScript::~PendingScript() |
| 35 { | 35 { |
| 36 } | 36 } |
| 37 | 37 |
| 38 PassRefPtr<Element> PendingScript::releaseElementAndClear() | 38 PassRefPtrWillBeRawPtr<Element> PendingScript::releaseElementAndClear() |
| 39 { | 39 { |
| 40 setScriptResource(0); | 40 setScriptResource(0); |
| 41 m_watchingForLoad = false; | 41 m_watchingForLoad = false; |
| 42 m_startingPosition = TextPosition::belowRangePosition(); | 42 m_startingPosition = TextPosition::belowRangePosition(); |
| 43 return m_element.release(); | 43 return m_element.release(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void PendingScript::setScriptResource(ScriptResource* resource) | 46 void PendingScript::setScriptResource(ScriptResource* resource) |
| 47 { | 47 { |
| 48 setResource(resource); | 48 setResource(resource); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void PendingScript::notifyFinished(Resource*) | 51 void PendingScript::notifyFinished(Resource*) |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| 55 void PendingScript::trace(Visitor* visitor) |
| 56 { |
| 57 // FIXME: Oilpan: this trace() is for a PendingScript that's not |
| 58 // on the heap -- it is kept by script runner objects |
| 59 // (ScriptRunner and HTMLScriptRunner), which are OwnPtr-kept by |
| 60 // the document and the HTML document parser, respectively. The |
| 61 // reason they are OwnPtrs and not on the heap themselves, is due |
| 62 // to their need to finalize by using their hosts -- something |
| 63 // that's not readily doable if both host and script runner object |
| 64 // are heap allocated. |
| 65 // |
| 66 // Find a better arrangment, or at least clarify that this is the |
| 67 // most practical way to handle such a dependency. |
| 68 visitor->trace(m_element); |
| 55 } | 69 } |
| 70 |
| 71 } |
| OLD | NEW |