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

Side by Side Diff: Source/WebCore/inspector/InspectorPageAgent.h

Issue 11413088: Merge 134577 - Web Inspector: highlight is not updating as one edits CSS properties (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 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
OLDNEW
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void domContentEventFired(); 132 void domContentEventFired();
133 void loadEventFired(); 133 void loadEventFired();
134 void frameNavigated(DocumentLoader*); 134 void frameNavigated(DocumentLoader*);
135 void frameDetached(Frame*); 135 void frameDetached(Frame*);
136 void loaderDetachedFromFrame(DocumentLoader*); 136 void loaderDetachedFromFrame(DocumentLoader*);
137 void applyScreenWidthOverride(long*); 137 void applyScreenWidthOverride(long*);
138 void applyScreenHeightOverride(long*); 138 void applyScreenHeightOverride(long*);
139 void didPaint(GraphicsContext*, const LayoutRect&); 139 void didPaint(GraphicsContext*, const LayoutRect&);
140 void didLayout(); 140 void didLayout();
141 void didScroll(); 141 void didScroll();
142 void didRecalculateStyle();
142 143
143 // Inspector Controller API 144 // Inspector Controller API
144 virtual void setFrontend(InspectorFrontend*); 145 virtual void setFrontend(InspectorFrontend*);
145 virtual void clearFrontend(); 146 virtual void clearFrontend();
146 virtual void restore(); 147 virtual void restore();
147 148
148 // Cross-agents API 149 // Cross-agents API
149 Frame* mainFrame(); 150 Frame* mainFrame();
150 String createIdentifier(); 151 String createIdentifier();
151 Frame* frameForId(const String& frameId); 152 Frame* frameForId(const String& frameId);
(...skipping 19 matching lines...) Expand all
171 InjectedScriptManager* m_injectedScriptManager; 172 InjectedScriptManager* m_injectedScriptManager;
172 InspectorClient* m_client; 173 InspectorClient* m_client;
173 InspectorFrontend::Page* m_frontend; 174 InspectorFrontend::Page* m_frontend;
174 InspectorOverlay* m_overlay; 175 InspectorOverlay* m_overlay;
175 long m_lastScriptIdentifier; 176 long m_lastScriptIdentifier;
176 String m_pendingScriptToEvaluateOnLoadOnce; 177 String m_pendingScriptToEvaluateOnLoadOnce;
177 String m_scriptToEvaluateOnLoadOnce; 178 String m_scriptToEvaluateOnLoadOnce;
178 HashMap<Frame*, String> m_frameToIdentifier; 179 HashMap<Frame*, String> m_frameToIdentifier;
179 HashMap<String, Frame*> m_identifierToFrame; 180 HashMap<String, Frame*> m_identifierToFrame;
180 HashMap<DocumentLoader*, String> m_loaderToIdentifier; 181 HashMap<DocumentLoader*, String> m_loaderToIdentifier;
181 bool m_didLoadEventFire; 182 bool m_enabled;
183 bool m_isFirstLayoutAfterOnLoad;
182 bool m_geolocationOverridden; 184 bool m_geolocationOverridden;
183 RefPtr<GeolocationPosition> m_geolocationPosition; 185 RefPtr<GeolocationPosition> m_geolocationPosition;
184 RefPtr<GeolocationPosition> m_platformGeolocationPosition; 186 RefPtr<GeolocationPosition> m_platformGeolocationPosition;
185 RefPtr<DeviceOrientationData> m_deviceOrientation; 187 RefPtr<DeviceOrientationData> m_deviceOrientation;
186 }; 188 };
187 189
188 190
189 } // namespace WebCore 191 } // namespace WebCore
190 192
191 #endif // ENABLE(INSPECTOR) 193 #endif // ENABLE(INSPECTOR)
192 194
193 #endif // !defined(InspectorPagerAgent_h) 195 #endif // !defined(InspectorPagerAgent_h)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.cpp ('k') | Source/WebCore/inspector/InspectorPageAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698