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

Side by Side Diff: Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

Issue 10919034: Merge 124689 - Disabling eval changes the timing of DidCreateScriptContext (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 3 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 | « no previous file | 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 /* 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 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8DOMWindowShell.h" 32 #include "V8DOMWindowShell.h"
33 33
34 #include "PlatformSupport.h" 34 #include "PlatformSupport.h"
35 #include "ContentSecurityPolicy.h" 35 #include "ContentSecurityPolicy.h"
36 #include "ContentSecurityPolicy.h" 36 #include "ContentSecurityPolicy.h"
37 #include "ContentSecurityPolicy.h"
37 #include "DateExtension.h" 38 #include "DateExtension.h"
38 #include "DocumentLoader.h" 39 #include "DocumentLoader.h"
39 #include "Frame.h" 40 #include "Frame.h"
40 #include "FrameLoaderClient.h" 41 #include "FrameLoaderClient.h"
41 #include "MemoryUsageSupport.h" 42 #include "MemoryUsageSupport.h"
42 #include "Page.h" 43 #include "Page.h"
43 #include "PageGroup.h" 44 #include "PageGroup.h"
44 #include "RuntimeEnabledFeatures.h" 45 #include "RuntimeEnabledFeatures.h"
45 #include "SafeAllocation.h" 46 #include "SafeAllocation.h"
46 #include "ScriptCallStack.h" 47 #include "ScriptCallStack.h"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 m_document->Delete(v8String(name)); 595 m_document->Delete(v8String(name));
595 } 596 }
596 597
597 void V8DOMWindowShell::updateSecurityOrigin() 598 void V8DOMWindowShell::updateSecurityOrigin()
598 { 599 {
599 v8::HandleScope scope; 600 v8::HandleScope scope;
600 setSecurityToken(); 601 setSecurityToken();
601 } 602 }
602 603
603 } // WebCore 604 } // WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698