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 20 matching lines...) Expand all Loading... | |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "FrameTestHelpers.h" | 33 #include "FrameTestHelpers.h" |
34 #include "URLTestHelpers.h" | 34 #include "URLTestHelpers.h" |
35 #include "V8Event.h" | 35 #include "V8Event.h" |
36 #include "WebFrame.h" | 36 #include "WebFrame.h" |
37 #include "WebFrameImpl.h" | 37 #include "WebFrameImpl.h" |
38 #include "WebView.h" | 38 #include "WebView.h" |
39 #include "WebViewImpl.h" | 39 #include "WebViewImpl.h" |
40 #include "bindings/v8/ExceptionStatePlaceholder.h" | 40 #include "bindings/v8/ExceptionStatePlaceholder.h" |
41 #include "bindings/v8/ScriptController.h" | |
41 #include "bindings/v8/SerializedScriptValue.h" | 42 #include "bindings/v8/SerializedScriptValue.h" |
42 #include "public/platform/Platform.h" | 43 #include "public/platform/Platform.h" |
43 #include "public/platform/WebUnitTestSupport.h" | 44 #include "public/platform/WebUnitTestSupport.h" |
44 #include "public/web/WebDOMCustomEvent.h" | 45 #include "public/web/WebDOMCustomEvent.h" |
45 #include "v8.h" | 46 #include "v8.h" |
46 | 47 |
47 #include <gtest/gtest.h> | 48 #include <gtest/gtest.h> |
48 | 49 |
49 using namespace WebCore; | 50 using namespace WebCore; |
50 using namespace WebKit; | 51 using namespace WebKit; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
98 const std::string baseURL = "http://www.test.com"; | 99 const std::string baseURL = "http://www.test.com"; |
99 const std::string path = "visible_iframe.html"; | 100 const std::string path = "visible_iframe.html"; |
100 | 101 |
101 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_s tr()), WebString::fromUTF8(path.c_str())); | 102 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_s tr()), WebString::fromUTF8(path.c_str())); |
102 WebView* webView = FrameTestHelpers::createWebViewAndLoad(baseURL + path); | 103 WebView* webView = FrameTestHelpers::createWebViewAndLoad(baseURL + path); |
103 WebFrameImpl* frame = toWebFrameImpl(webView->mainFrame()); | 104 WebFrameImpl* frame = toWebFrameImpl(webView->mainFrame()); |
104 | 105 |
105 WebDOMEvent event = frame->frame()->document()->createEvent("CustomEvent", I GNORE_EXCEPTION); | 106 WebDOMEvent event = frame->frame()->document()->createEvent("CustomEvent", I GNORE_EXCEPTION); |
106 WebDOMCustomEvent customEvent = event.to<WebDOMCustomEvent>(); | 107 WebDOMCustomEvent customEvent = event.to<WebDOMCustomEvent>(); |
107 | 108 |
108 v8::HandleScope handleScope; | 109 v8::HandleScope handleScope(frame->frame()->script()->isolate()); |
pfeldman
2013/09/03 09:40:21
Looks like a pattern. ScriptController::GetIsolate
marja
2013/09/03 11:09:30
Added getIsolateFromFrame to V8Bindings.h (matches
| |
109 customEvent.initCustomEvent("blah", false, false, WebSerializedScriptValue:: serialize(v8::Boolean::New(true))); | 110 customEvent.initCustomEvent("blah", false, false, WebSerializedScriptValue:: serialize(v8::Boolean::New(true))); |
110 RefPtr<EventListener> listener = TestListener::create(frame->mainWorldScript Context()); | 111 RefPtr<EventListener> listener = TestListener::create(frame->mainWorldScript Context()); |
111 frame->frame()->document()->addEventListener("blah", listener, false); | 112 frame->frame()->document()->addEventListener("blah", listener, false); |
112 frame->frame()->document()->dispatchEvent(event); | 113 frame->frame()->document()->dispatchEvent(event); |
113 | 114 |
114 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 115 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
115 webView->close(); | 116 webView->close(); |
116 } | 117 } |
117 | 118 |
118 } | 119 } |
OLD | NEW |