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

Side by Side Diff: Source/core/dom/ExecutionContext.cpp

Issue 313173012: HTMLParser should use current value of scriptEnabled flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@WebKit-ADD
Patch Set: New approach Created 6 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2012 Google Inc. All Rights Reserved. 3 * Copyright (C) 2012 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 int m_columnNumber; 57 int m_columnNumber;
58 String m_sourceURL; 58 String m_sourceURL;
59 RefPtr<ScriptCallStack> m_callStack; 59 RefPtr<ScriptCallStack> m_callStack;
60 }; 60 };
61 61
62 ExecutionContext::ExecutionContext() 62 ExecutionContext::ExecutionContext()
63 : m_client(0) 63 : m_client(0)
64 , m_sandboxFlags(SandboxNone) 64 , m_sandboxFlags(SandboxNone)
65 , m_circularSequentialID(0) 65 , m_circularSequentialID(0)
66 , m_inDispatchErrorEvent(false) 66 , m_inDispatchErrorEvent(false)
67 , m_scriptEnabled(false)
abarth-chromium 2014/06/26 19:53:37 What about other subclasses of ExecutionContext?
mmal 2014/06/27 19:39:16 WorkerGlobalScope seems to have its own WorkerScri
67 , m_activeDOMObjectsAreSuspended(false) 68 , m_activeDOMObjectsAreSuspended(false)
68 , m_activeDOMObjectsAreStopped(false) 69 , m_activeDOMObjectsAreStopped(false)
69 { 70 {
70 } 71 }
71 72
72 ExecutionContext::~ExecutionContext() 73 ExecutionContext::~ExecutionContext()
73 { 74 {
74 } 75 }
75 76
76 bool ExecutionContext::hasPendingActivity() 77 bool ExecutionContext::hasPendingActivity()
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 327
327 RELEASE_ASSERT(m_client); 328 RELEASE_ASSERT(m_client);
328 // The SandboxOrigin is stored redundantly in the security origin. 329 // The SandboxOrigin is stored redundantly in the security origin.
329 if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin () && !m_client->securityContext().securityOrigin()->isUnique()) { 330 if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin () && !m_client->securityContext().securityOrigin()->isUnique()) {
330 m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUniq ue()); 331 m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUniq ue());
331 m_client->didUpdateSecurityOrigin(); 332 m_client->didUpdateSecurityOrigin();
332 } 333 }
333 } 334 }
334 335
335 } // namespace WebCore 336 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698