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

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

Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open. (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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 updateTouchEventEmulationInPage(false); 348 updateTouchEventEmulationInPage(false);
349 #endif 349 #endif
350 m_frontend = 0; 350 m_frontend = 0;
351 } 351 }
352 352
353 void InspectorPageAgent::restore() 353 void InspectorPageAgent::restore()
354 { 354 {
355 if (m_state->getBoolean(PageAgentState::pageAgentEnabled)) { 355 if (m_state->getBoolean(PageAgentState::pageAgentEnabled)) {
356 ErrorString error; 356 ErrorString error;
357 enable(&error); 357 enable(&error);
358
359 if (m_inspectorAgent->didCommitLoadFired())
360 frameNavigated(m_page->mainFrame()->loader()->documentLoader());
361 #if ENABLE(TOUCH_EVENTS) 358 #if ENABLE(TOUCH_EVENTS)
362 updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touc hEventEmulationEnabled)); 359 updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touc hEventEmulationEnabled));
363 #endif 360 #endif
364 } 361 }
365 } 362 }
366 363
367 void InspectorPageAgent::enable(ErrorString*) 364 void InspectorPageAgent::enable(ErrorString*)
368 { 365 {
369 m_state->setBoolean(PageAgentState::pageAgentEnabled, true); 366 m_state->setBoolean(PageAgentState::pageAgentEnabled, true);
370 bool scriptExecutionDisabled = m_state->getBoolean(PageAgentState::pageAgent ScriptExecutionDisabled); 367 bool scriptExecutionDisabled = m_state->getBoolean(PageAgentState::pageAgent ScriptExecutionDisabled);
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 if (!settings) 1114 if (!settings)
1118 return; 1115 return;
1119 1116
1120 settings->setShowDebugBorders(visible); 1117 settings->setShowDebugBorders(visible);
1121 settings->setShowRepaintCounter(visible); 1118 settings->setShowRepaintCounter(visible);
1122 } 1119 }
1123 1120
1124 } // namespace WebCore 1121 } // namespace WebCore
1125 1122
1126 #endif // ENABLE(INSPECTOR) 1123 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.cpp ('k') | Source/WebCore/inspector/InspectorRuntimeAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698