| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions are | 7 * modification, are permitted provided that the following conditions are |
| 8 * met: | 8 * met: |
| 9 * | 9 * |
| 10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "bindings/core/v8/V8Binding.h" | 40 #include "bindings/core/v8/V8Binding.h" |
| 41 #include "bindings/core/v8/V8Event.h" | 41 #include "bindings/core/v8/V8Event.h" |
| 42 #include "bindings/core/v8/V8GCController.h" | 42 #include "bindings/core/v8/V8GCController.h" |
| 43 #include "bindings/core/v8/V8HTMLElement.h" | 43 #include "bindings/core/v8/V8HTMLElement.h" |
| 44 #include "bindings/core/v8/V8PerContextData.h" | 44 #include "bindings/core/v8/V8PerContextData.h" |
| 45 #include "bindings/core/v8/V8ScriptRunner.h" | 45 #include "bindings/core/v8/V8ScriptRunner.h" |
| 46 #include "bindings/core/v8/V8Window.h" | 46 #include "bindings/core/v8/V8Window.h" |
| 47 #include "bindings/core/v8/WindowProxy.h" | 47 #include "bindings/core/v8/WindowProxy.h" |
| 48 #include "core/dom/Document.h" | 48 #include "core/dom/Document.h" |
| 49 #include "core/dom/Node.h" | 49 #include "core/dom/Node.h" |
| 50 #include "core/dom/ScriptableDocumentParser.h" | |
| 51 #include "core/events/Event.h" | 50 #include "core/events/Event.h" |
| 52 #include "core/events/EventListener.h" | 51 #include "core/events/EventListener.h" |
| 53 #include "core/frame/LocalDOMWindow.h" | 52 #include "core/frame/LocalDOMWindow.h" |
| 54 #include "core/frame/LocalFrame.h" | 53 #include "core/frame/LocalFrame.h" |
| 55 #include "core/frame/Settings.h" | 54 #include "core/frame/Settings.h" |
| 56 #include "core/frame/UseCounter.h" | 55 #include "core/frame/UseCounter.h" |
| 57 #include "core/html/HTMLLinkElement.h" | 56 #include "core/html/HTMLLinkElement.h" |
| 58 #include "core/html/imports/HTMLImportChild.h" | 57 #include "core/html/imports/HTMLImportChild.h" |
| 59 #include "core/html/imports/HTMLImportLoader.h" | 58 #include "core/html/imports/HTMLImportLoader.h" |
| 59 #include "core/html/parser/HTMLDocumentParser.h" |
| 60 #include "core/inspector/InspectorTraceEvents.h" | 60 #include "core/inspector/InspectorTraceEvents.h" |
| 61 #include "core/inspector/ScriptCallStack.h" | 61 #include "core/inspector/ScriptCallStack.h" |
| 62 #include "core/loader/FrameLoaderClient.h" | 62 #include "core/loader/FrameLoaderClient.h" |
| 63 #include "platform/NotImplemented.h" | 63 #include "platform/NotImplemented.h" |
| 64 #include "platform/TraceEvent.h" | 64 #include "platform/TraceEvent.h" |
| 65 #include "platform/UserGestureIndicator.h" | 65 #include "platform/UserGestureIndicator.h" |
| 66 #include "platform/Widget.h" | 66 #include "platform/Widget.h" |
| 67 #include "public/platform/Platform.h" | 67 #include "public/platform/Platform.h" |
| 68 #include "wtf/CurrentTime.h" | 68 #include "wtf/CurrentTime.h" |
| 69 #include "wtf/StdLibExtras.h" | 69 #include "wtf/StdLibExtras.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 windowProxy = isolatedWorldWindowProxy.get(); | 183 windowProxy = isolatedWorldWindowProxy.get(); |
| 184 m_isolatedWorlds.set(world.worldId(), isolatedWorldWindowProxy.relea
se()); | 184 m_isolatedWorlds.set(world.worldId(), isolatedWorldWindowProxy.relea
se()); |
| 185 } | 185 } |
| 186 } | 186 } |
| 187 windowProxy->initializeIfNeeded(); | 187 windowProxy->initializeIfNeeded(); |
| 188 return windowProxy; | 188 return windowProxy; |
| 189 } | 189 } |
| 190 | 190 |
| 191 TextPosition ScriptController::eventHandlerPosition() const | 191 TextPosition ScriptController::eventHandlerPosition() const |
| 192 { | 192 { |
| 193 ScriptableDocumentParser* parser = m_frame->document()->scriptableDocumentPa
rser(); | 193 HTMLDocumentParser* parser = m_frame->document()->scriptableDocumentParser()
; |
| 194 if (parser) | 194 if (parser) |
| 195 return parser->textPosition(); | 195 return parser->textPosition(); |
| 196 return TextPosition::minimumPosition(); | 196 return TextPosition::minimumPosition(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 V8Extensions& ScriptController::registeredExtensions() | 199 V8Extensions& ScriptController::registeredExtensions() |
| 200 { | 200 { |
| 201 DEFINE_STATIC_LOCAL(V8Extensions, extensions, ()); | 201 DEFINE_STATIC_LOCAL(V8Extensions, extensions, ()); |
| 202 return extensions; | 202 return extensions; |
| 203 } | 203 } |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 } | 359 } |
| 360 } | 360 } |
| 361 | 361 |
| 362 module.formalDependenciesAndSource.append(v8String(m_isolate, source)); | 362 module.formalDependenciesAndSource.append(v8String(m_isolate, source)); |
| 363 V8ScriptRunner::runModule(m_isolate, m_frame->document(), module); | 363 V8ScriptRunner::runModule(m_isolate, m_frame->document(), module); |
| 364 } | 364 } |
| 365 | 365 |
| 366 } // namespace blink | 366 } // namespace blink |
| OLD | NEW |