Source/core/inspector/PageRuntimeAgent.h - Issue 146683003: Settings should not call into inspector

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

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 11 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

« Source/core/inspector/InspectorPageAgent.h ('K') | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/core/inspector/PageRuntimeAgent.cpp » ('j') | Source/core/inspector/PageRuntimeAgent.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 adoptPtr(new PageRuntimeAgent(instrumentingAgents, state, injecte dScriptManager, scriptDebugServer, page, pageAgent));	49 return adoptPtr(new PageRuntimeAgent(instrumentingAgents, state, injecte dScriptManager, scriptDebugServer, page, pageAgent));

50 }	50 }

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

52 virtual void setFrontend(InspectorFrontend*) OVERRIDE;	52 virtual void setFrontend(InspectorFrontend*) OVERRIDE;

53 virtual void clearFrontend() OVERRIDE;	53 virtual void clearFrontend() OVERRIDE;

54 virtual void restore() OVERRIDE;	54 virtual void restore() OVERRIDE;

55 virtual void enable(ErrorString*) OVERRIDE;	55 virtual void enable(ErrorString*) OVERRIDE;

56 virtual void disable(ErrorString*) OVERRIDE;	56 virtual void disable(ErrorString*) OVERRIDE;

57	57

	58 void scriptsEnabled(Frame*, bool isEnabled);
	pfeldman 2014/01/24 16:25:21 You don't need these. You don't need these. gnana 2014/01/27 16:31:07 Done. Show quoted text On 2014/01/24 16:25:21, pfeldman wrote: > You don't need these. Done.
	59 void textAutosizingEnabled(Frame*, bool isEnabled);

	60 void fontScaleFactor(Frame*, float factor);

58 void didClearWindowObjectInWorld(Frame, DOMWrapperWorld);	61 void didClearWindowObjectInWorld(Frame, DOMWrapperWorld);

59 void didCreateIsolatedContext(Frame, ScriptState, SecurityOrigin*);	62 void didCreateIsolatedContext(Frame, ScriptState, SecurityOrigin*);

60	63

61 private:	64 private:

62 PageRuntimeAgent(InstrumentingAgents, InspectorCompositeState, InjectedScr iptManager, ScriptDebugServer, Page, InspectorPageAgent);	65 PageRuntimeAgent(InstrumentingAgents, InspectorCompositeState, InjectedScr iptManager, ScriptDebugServer, Page, InspectorPageAgent);

63	66

64 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) OVERRIDE;	67 virtual InjectedScript injectedScriptForEval(ErrorString, const int execut ionContextId) OVERRIDE;

65 virtual void muteConsole() OVERRIDE;	68 virtual void muteConsole() OVERRIDE;

66 virtual void unmuteConsole() OVERRIDE;	69 virtual void unmuteConsole() OVERRIDE;

67 void reportExecutionContextCreation();	70 void reportExecutionContextCreation();

68 void notifyContextCreated(const String& frameId, ScriptState, SecurityOrigi n, bool isPageContext);	71 void notifyContextCreated(const String& frameId, ScriptState, SecurityOrigi n, bool isPageContext);

69	72

70 Page* m_inspectedPage;	73 Page* m_inspectedPage;

71 InspectorPageAgent* m_pageAgent;	74 InspectorPageAgent* m_pageAgent;

72 InspectorFrontend::Runtime* m_frontend;	75 InspectorFrontend::Runtime* m_frontend;

73 bool m_mainWorldContextCreated;	76 bool m_mainWorldContextCreated;

74 };	77 };

75	78

76 } // namespace WebCore	79 } // namespace WebCore

77	80

78	81

79 #endif // !defined(InspectorPagerAgent_h)	82 #endif // !defined(InspectorPagerAgent_h)

OLD	NEW