Title: [89456] trunk/Source/WebCore
- Revision
- 89456
- Author
- [email protected]
- Date
- 2011-06-22 12:26:46 -0700 (Wed, 22 Jun 2011)
Log Message
2011-06-22 Sreeram Ramachandran <[email protected]>
Reviewed by Pavel Feldman.
Web Inspector: Restore console messages when restoring inspector state
https://bugs.webkit.org/show_bug.cgi?id=63146
No new tests (no change in functionality, only in display).
* inspector/InspectorConsoleAgent.cpp:
(WebCore::InspectorConsoleAgent::restore):
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::restoreInspectorStateFromCookie):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89455 => 89456)
--- trunk/Source/WebCore/ChangeLog 2011-06-22 19:02:24 UTC (rev 89455)
+++ trunk/Source/WebCore/ChangeLog 2011-06-22 19:26:46 UTC (rev 89456)
@@ -1,3 +1,18 @@
+2011-06-22 Sreeram Ramachandran <[email protected]>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Restore console messages when restoring inspector state
+ https://bugs.webkit.org/show_bug.cgi?id=63146
+
+ No new tests (no change in functionality, only in display).
+
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::restore):
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::restoreInspectorStateFromCookie):
+
2011-06-22 Adam Barth <[email protected]>
Attempt to fix the GTK build after my incomplete rollout of 88332.
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (89455 => 89456)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-06-22 19:02:24 UTC (rev 89455)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-06-22 19:26:46 UTC (rev 89456)
@@ -115,6 +115,15 @@
m_counts.clear();
}
+void InspectorConsoleAgent::restore()
+{
+ if (m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled)) {
+ ErrorString error;
+ int expiredCount;
+ enable(&error, &expiredCount);
+ }
+}
+
void InspectorConsoleAgent::setFrontend(InspectorFrontend* frontend)
{
m_frontend = frontend->console();
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (89455 => 89456)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-06-22 19:02:24 UTC (rev 89455)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-06-22 19:26:46 UTC (rev 89456)
@@ -63,6 +63,7 @@
void disable(ErrorString*);
void clearConsoleMessages(ErrorString* error);
void reset();
+ void restore();
void setFrontend(InspectorFrontend*);
void clearFrontend();
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (89455 => 89456)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2011-06-22 19:02:24 UTC (rev 89455)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2011-06-22 19:26:46 UTC (rev 89456)
@@ -332,6 +332,7 @@
m_domAgent->restore();
m_resourceAgent->restore();
m_timelineAgent->restore();
+ m_consoleAgent->restore();
#if ENABLE(DATABASE)
m_databaseAgent->restore();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
