| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 static KURL documentURLForScriptExecution(Document* document) | 73 static KURL documentURLForScriptExecution(Document* document) |
| 74 { | 74 { |
| 75 if (!document || !document->frame()) | 75 if (!document || !document->frame()) |
| 76 return KURL(); | 76 return KURL(); |
| 77 | 77 |
| 78 // Use the URL of the currently active document for this frame. | 78 // Use the URL of the currently active document for this frame. |
| 79 return document->frame()->document()->url(); | 79 return document->frame()->document()->url(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 inline PassRefPtr<Event> createScriptLoadEvent() | 82 inline PassRefPtrWillBeRawPtr<Event> createScriptLoadEvent() |
| 83 { | 83 { |
| 84 return Event::create(EventTypeNames::load); | 84 return Event::create(EventTypeNames::load); |
| 85 } | 85 } |
| 86 | 86 |
| 87 ScriptSourceCode HTMLScriptRunner::sourceFromPendingScript(const PendingScript&
script, bool& errorOccurred) const | 87 ScriptSourceCode HTMLScriptRunner::sourceFromPendingScript(const PendingScript&
script, bool& errorOccurred) const |
| 88 { | 88 { |
| 89 if (script.resource()) { | 89 if (script.resource()) { |
| 90 errorOccurred = script.resource()->errorOccurred(); | 90 errorOccurred = script.resource()->errorOccurred(); |
| 91 ASSERT(script.resource()->isLoaded()); | 91 ASSERT(script.resource()->isLoaded()); |
| 92 return ScriptSourceCode(script.resource()); | 92 return ScriptSourceCode(script.resource()); |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 ScriptSourceCode sourceCode(script->textContent(), documentURLFo
rScriptExecution(m_document), scriptStartPosition); | 316 ScriptSourceCode sourceCode(script->textContent(), documentURLFo
rScriptExecution(m_document), scriptStartPosition); |
| 317 scriptLoader->executeScript(sourceCode); | 317 scriptLoader->executeScript(sourceCode); |
| 318 } | 318 } |
| 319 } else { | 319 } else { |
| 320 requestParsingBlockingScript(script); | 320 requestParsingBlockingScript(script); |
| 321 } | 321 } |
| 322 } | 322 } |
| 323 } | 323 } |
| 324 | 324 |
| 325 } | 325 } |
| OLD | NEW |