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

Side by Side Diff: sky/engine/core/dom/ExecutionContext.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/dom/Element.idl ('k') | sky/engine/core/dom/ExecutionContext.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 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 const KURL& url() const; 58 const KURL& url() const;
59 KURL completeURL(const String& url) const; 59 KURL completeURL(const String& url) const;
60 LocalDOMWindow* executingWindow() const; 60 LocalDOMWindow* executingWindow() const;
61 double timerAlignmentInterval() const; 61 double timerAlignmentInterval() const;
62 62
63 virtual void reportBlockedScriptExecutionToInspector(const String& directive Text) = 0; 63 virtual void reportBlockedScriptExecutionToInspector(const String& directive Text) = 0;
64 64
65 KURL contextURL() const { return virtualURL(); } 65 KURL contextURL() const { return virtualURL(); }
66 KURL contextCompleteURL(const String& url) const { return virtualCompleteURL (url); } 66 KURL contextCompleteURL(const String& url) const { return virtualCompleteURL (url); }
67 67
68 bool shouldSanitizeScriptError(const String& sourceURL);
69 void reportException(PassRefPtr<ErrorEvent>, int scriptId, PassRefPtr<Script CallStack>); 68 void reportException(PassRefPtr<ErrorEvent>, int scriptId, PassRefPtr<Script CallStack>);
70 69
71 void addConsoleMessage(PassRefPtr<ConsoleMessage>); 70 void addConsoleMessage(PassRefPtr<ConsoleMessage>);
72 71
73 // Active objects are not garbage collected even if inaccessible, e.g. becau se their activity may result in callbacks being invoked. 72 // Active objects are not garbage collected even if inaccessible, e.g. becau se their activity may result in callbacks being invoked.
74 bool hasPendingActivity(); 73 bool hasPendingActivity();
75 74
76 void stopActiveDOMObjects(); 75 void stopActiveDOMObjects();
77 unsigned activeDOMObjectCount(); 76 unsigned activeDOMObjectCount();
78 77
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 136
138 // The location of this member is important; to make sure contextDestroyed() notification on 137 // The location of this member is important; to make sure contextDestroyed() notification on
139 // ExecutionContext's members (notably m_timeouts) is called before they are destructed, 138 // ExecutionContext's members (notably m_timeouts) is called before they are destructed,
140 // m_lifecycleNotifer should be placed *after* such members. 139 // m_lifecycleNotifer should be placed *after* such members.
141 OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier; 140 OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier;
142 }; 141 };
143 142
144 } // namespace blink 143 } // namespace blink
145 144
146 #endif // SKY_ENGINE_CORE_DOM_EXECUTIONCONTEXT_H_ 145 #endif // SKY_ENGINE_CORE_DOM_EXECUTIONCONTEXT_H_
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Element.idl ('k') | sky/engine/core/dom/ExecutionContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698