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

Side by Side Diff: Source/bindings/core/v8/WindowProxy.cpp

Issue 1110433002: Make Isolate as the first argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Compile error 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
« no previous file with comments | « Source/bindings/core/v8/WindowProxy.h ('k') | Source/bindings/core/v8/WindowProxyManager.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include <v8.h> 70 #include <v8.h>
71 71
72 namespace blink { 72 namespace blink {
73 73
74 static void checkDocumentWrapper(v8::Local<v8::Object> wrapper, Document* docume nt) 74 static void checkDocumentWrapper(v8::Local<v8::Object> wrapper, Document* docume nt)
75 { 75 {
76 ASSERT(V8Document::toImpl(wrapper) == document); 76 ASSERT(V8Document::toImpl(wrapper) == document);
77 ASSERT(!document->isHTMLDocument() || (V8Document::toImpl(v8::Local<v8::Obje ct>::Cast(wrapper->GetPrototype())) == document)); 77 ASSERT(!document->isHTMLDocument() || (V8Document::toImpl(v8::Local<v8::Obje ct>::Cast(wrapper->GetPrototype())) == document));
78 } 78 }
79 79
80 PassOwnPtrWillBeRawPtr<WindowProxy> WindowProxy::create(Frame* frame, DOMWrapper World& world, v8::Isolate* isolate) 80 PassOwnPtrWillBeRawPtr<WindowProxy> WindowProxy::create(v8::Isolate* isolate, Fr ame* frame, DOMWrapperWorld& world)
81 { 81 {
82 return adoptPtrWillBeNoop(new WindowProxy(frame, &world, isolate)); 82 return adoptPtrWillBeNoop(new WindowProxy(frame, &world, isolate));
83 } 83 }
84 84
85 WindowProxy::WindowProxy(Frame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Is olate* isolate) 85 WindowProxy::WindowProxy(Frame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Is olate* isolate)
86 : m_frame(frame) 86 : m_frame(frame)
87 , m_isolate(isolate) 87 , m_isolate(isolate)
88 , m_world(world) 88 , m_world(world)
89 , m_installingDOMWindow(false) 89 , m_installingDOMWindow(false)
90 { 90 {
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 510
511 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) 511 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin)
512 { 512 {
513 ASSERT(m_world->isMainWorld()); 513 ASSERT(m_world->isMainWorld());
514 if (!isContextInitialized()) 514 if (!isContextInitialized())
515 return; 515 return;
516 setSecurityToken(origin); 516 setSecurityToken(origin);
517 } 517 }
518 518
519 } // namespace blink 519 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/WindowProxy.h ('k') | Source/bindings/core/v8/WindowProxyManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698