Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: Source/web/tests/ActivityLoggerTest.cpp

Issue 1100893002: Revert of bindings: Do not use ScriptWrappable::wrap for RemoteDOMWindow. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/RemoteDOMWindow.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "FrameTestHelpers.h" 7 #include "FrameTestHelpers.h"
8 #include "bindings/core/v8/ScriptController.h" 8 #include "bindings/core/v8/ScriptController.h"
9 #include "bindings/core/v8/ScriptSourceCode.h" 9 #include "bindings/core/v8/ScriptSourceCode.h"
10 #include "bindings/core/v8/V8Binding.h" 10 #include "bindings/core/v8/V8Binding.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 { 108 {
109 const char* code = 109 const char* code =
110 "document.body.innerHTML = '<a onclick=\\\'do()\\\'>test</a>';" 110 "document.body.innerHTML = '<a onclick=\\\'do()\\\'>test</a>';"
111 "document.body.onchange = function(){};" 111 "document.body.onchange = function(){};"
112 "document.body.setAttribute('onfocus', 'fnc()');" 112 "document.body.setAttribute('onfocus', 'fnc()');"
113 "document.body.addEventListener('onload', function(){});"; 113 "document.body.addEventListener('onload', function(){});";
114 const char* expectedActivities = 114 const char* expectedActivities =
115 "blinkAddEventListener | A | click\n" 115 "blinkAddEventListener | A | click\n"
116 "blinkAddElement | a | \n" 116 "blinkAddElement | a | \n"
117 "blinkAddEventListener | BODY | change\n" 117 "blinkAddEventListener | BODY | change\n"
118 "blinkAddEventListener | DOMWindow | focus\n" 118 "blinkAddEventListener | LocalDOMWindow | focus\n"
119 "blinkAddEventListener | BODY | onload"; 119 "blinkAddEventListener | BODY | onload";
120 executeScriptInMainWorld(code); 120 executeScriptInMainWorld(code);
121 ASSERT_TRUE(verifyActivities("")); 121 ASSERT_TRUE(verifyActivities(""));
122 executeScriptInIsolatedWorld(code); 122 executeScriptInIsolatedWorld(code);
123 ASSERT_TRUE(verifyActivities(expectedActivities)); 123 ASSERT_TRUE(verifyActivities(expectedActivities));
124 } 124 }
125 125
126 TEST_F(ActivityLoggerTest, ScriptElement) 126 TEST_F(ActivityLoggerTest, ScriptElement)
127 { 127 {
128 const char* code = 128 const char* code =
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 "blinkAddElement | script | data:text/html;charset=utf-8,D\n" 518 "blinkAddElement | script | data:text/html;charset=utf-8,D\n"
519 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" 519 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n"
520 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ; 520 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E" ;
521 executeScriptInMainWorld(code); 521 executeScriptInMainWorld(code);
522 ASSERT_TRUE(verifyActivities("")); 522 ASSERT_TRUE(verifyActivities(""));
523 executeScriptInIsolatedWorld(code); 523 executeScriptInIsolatedWorld(code);
524 ASSERT_TRUE(verifyActivities(expectedActivities)); 524 ASSERT_TRUE(verifyActivities(expectedActivities));
525 } 525 }
526 526
527 } // namespace 527 } // namespace
OLDNEW
« no previous file with comments | « Source/core/frame/RemoteDOMWindow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698