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

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

Issue 11415147: Merge 135571 - Web Inspector: inspector overlay is always updated when inspector is open (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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/WebCore/inspector/InspectorPageAgent.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 int currentHeight = static_cast<int>(m_state->getLong(PageAgentState::pa geAgentScreenHeightOverride)); 363 int currentHeight = static_cast<int>(m_state->getLong(PageAgentState::pa geAgentScreenHeightOverride));
364 double currentFontScaleFactor = m_state->getDouble(PageAgentState::pageA gentFontScaleFactorOverride); 364 double currentFontScaleFactor = m_state->getDouble(PageAgentState::pageA gentFontScaleFactorOverride);
365 bool currentFitWindow = m_state->getBoolean(PageAgentState::pageAgentFit Window); 365 bool currentFitWindow = m_state->getBoolean(PageAgentState::pageAgentFit Window);
366 updateViewMetrics(currentWidth, currentHeight, currentFontScaleFactor, c urrentFitWindow); 366 updateViewMetrics(currentWidth, currentHeight, currentFontScaleFactor, c urrentFitWindow);
367 #if ENABLE(TOUCH_EVENTS) 367 #if ENABLE(TOUCH_EVENTS)
368 updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touc hEventEmulationEnabled)); 368 updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touc hEventEmulationEnabled));
369 #endif 369 #endif
370 } 370 }
371 } 371 }
372 372
373 void InspectorPageAgent::webViewResized(const IntSize& size)
374 {
375 int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAge ntScreenWidthOverride));
376 m_overlay->resize(currentWidth ? size : IntSize());
377 }
378
373 void InspectorPageAgent::enable(ErrorString*) 379 void InspectorPageAgent::enable(ErrorString*)
374 { 380 {
375 m_enabled = true; 381 m_enabled = true;
376 m_state->setBoolean(PageAgentState::pageAgentEnabled, true); 382 m_state->setBoolean(PageAgentState::pageAgentEnabled, true);
377 m_instrumentingAgents->setInspectorPageAgent(this); 383 m_instrumentingAgents->setInspectorPageAgent(this);
378 } 384 }
379 385
380 void InspectorPageAgent::disable(ErrorString*) 386 void InspectorPageAgent::disable(ErrorString*)
381 { 387 {
382 m_enabled = false; 388 m_enabled = false;
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 if (!settings) 1141 if (!settings)
1136 return; 1142 return;
1137 1143
1138 settings->setShowDebugBorders(visible); 1144 settings->setShowDebugBorders(visible);
1139 settings->setShowRepaintCounter(visible); 1145 settings->setShowRepaintCounter(visible);
1140 } 1146 }
1141 1147
1142 } // namespace WebCore 1148 } // namespace WebCore
1143 1149
1144 #endif // ENABLE(INSPECTOR) 1150 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorPageAgent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698