Source/core/inspector/PageRuntimeAgent.h - Issue 711853002: Revert of Fix Runtime.executionContextCreated for crafted iframes.

Side by Side Diff: Source/core/inspector/PageRuntimeAgent.h

Issue 711853002: Revert of Fix Runtime.executionContextCreated for crafted iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 1 month 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/core/inspector/InspectorInstrumentation.idl ('k') | Source/core/inspector/PageRuntimeAgent.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 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 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 {	48 {

49 return adoptPtrWillBeNoop(new PageRuntimeAgent(injectedScriptManager, cl ient, scriptDebugServer, page, pageAgent));	49 return adoptPtrWillBeNoop(new PageRuntimeAgent(injectedScriptManager, cl ient, scriptDebugServer, page, pageAgent));

50 }	50 }

51 virtual ~PageRuntimeAgent();	51 virtual ~PageRuntimeAgent();

52 virtual void trace(Visitor*) override;	52 virtual void trace(Visitor*) override;

53 virtual void init() override;	53 virtual void init() override;

54 virtual void enable(ErrorString*) override;	54 virtual void enable(ErrorString*) override;

55 virtual void run(ErrorString*) override;	55 virtual void run(ErrorString*) override;

56	56

57 void didClearDocumentOfWindowObject(LocalFrame*);	57 void didClearDocumentOfWindowObject(LocalFrame*);

58 void didCreateMainWorldContext(LocalFrame, ScriptState, SecurityOrigin*);

59 void didCreateIsolatedContext(LocalFrame, ScriptState, SecurityOrigin*);	58 void didCreateIsolatedContext(LocalFrame, ScriptState, SecurityOrigin*);

60 void frameWindowDiscarded(LocalDOMWindow*);	59 void frameWindowDiscarded(LocalDOMWindow*);

61	60

62 private:	61 private:

63 PageRuntimeAgent(InjectedScriptManager, InspectorClient, ScriptDebugServer , Page, InspectorPageAgent*);	62 PageRuntimeAgent(InjectedScriptManager, InspectorClient, ScriptDebugServer , Page, InspectorPageAgent*);

64	63

65 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) override;	64 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) override;

66 virtual void muteConsole() override;	65 virtual void muteConsole() override;

67 virtual void unmuteConsole() override;	66 virtual void unmuteConsole() override;

68 void registerMainWorldContext(LocalFrame*);	67 void reportExecutionContextCreation();

69 void reportExecutionContextsToFrontend();

70	68

71 InspectorClient* m_client;	69 InspectorClient* m_client;

72 RawPtrWillBeMember<Page> m_inspectedPage;	70 RawPtrWillBeMember<Page> m_inspectedPage;

73 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;	71 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;

74 bool m_mainWorldContextCreated;	72 bool m_mainWorldContextCreated;

75 };	73 };

76	74

77 } // namespace blink	75 } // namespace blink

78	76

79	77

80 #endif // !defined(InspectorPagerAgent_h)	78 #endif // !defined(InspectorPagerAgent_h)

OLD	NEW