OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010-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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 { | 356 { |
357 if (m_emulateViewportEnabled) | 357 if (m_emulateViewportEnabled) |
358 return; | 358 return; |
359 m_emulateViewportEnabled = true; | 359 m_emulateViewportEnabled = true; |
360 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab
led(); | 360 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab
led(); |
361 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); | 361 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); |
362 m_originalViewportEnabled = RuntimeEnabledFeatures::cssViewportEnabled(); | 362 m_originalViewportEnabled = RuntimeEnabledFeatures::cssViewportEnabled(); |
363 RuntimeEnabledFeatures::setCSSViewportEnabled(true); | 363 RuntimeEnabledFeatures::setCSSViewportEnabled(true); |
364 m_webViewImpl->settings()->setViewportEnabled(true); | 364 m_webViewImpl->settings()->setViewportEnabled(true); |
365 m_webViewImpl->settings()->setViewportMetaEnabled(true); | 365 m_webViewImpl->settings()->setViewportMetaEnabled(true); |
| 366 m_webViewImpl->settings()->setShrinksViewportContentToFit(true); |
366 m_webViewImpl->setIgnoreViewportTagScaleLimits(true); | 367 m_webViewImpl->setIgnoreViewportTagScaleLimits(true); |
367 m_webViewImpl->setPageScaleFactorLimits(-1, -1); | 368 m_webViewImpl->setPageScaleFactorLimits(-1, -1); |
368 m_webViewImpl->setZoomFactorOverride(1); | 369 m_webViewImpl->setZoomFactorOverride(1); |
369 } | 370 } |
370 | 371 |
371 void WebDevToolsAgentImpl::disableViewportEmulation() | 372 void WebDevToolsAgentImpl::disableViewportEmulation() |
372 { | 373 { |
373 if (!m_emulateViewportEnabled) | 374 if (!m_emulateViewportEnabled) |
374 return; | 375 return; |
375 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna
bled); | 376 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna
bled); |
376 RuntimeEnabledFeatures::setCSSViewportEnabled(m_originalViewportEnabled); | 377 RuntimeEnabledFeatures::setCSSViewportEnabled(m_originalViewportEnabled); |
377 m_webViewImpl->settings()->setViewportEnabled(false); | 378 m_webViewImpl->settings()->setViewportEnabled(false); |
378 m_webViewImpl->settings()->setViewportMetaEnabled(false); | 379 m_webViewImpl->settings()->setViewportMetaEnabled(false); |
| 380 m_webViewImpl->settings()->setShrinksViewportContentToFit(false); |
379 m_webViewImpl->setIgnoreViewportTagScaleLimits(false); | 381 m_webViewImpl->setIgnoreViewportTagScaleLimits(false); |
380 m_webViewImpl->setPageScaleFactorLimits(1, 1); | 382 m_webViewImpl->setPageScaleFactorLimits(1, 1); |
381 m_webViewImpl->setZoomFactorOverride(0); | 383 m_webViewImpl->setZoomFactorOverride(0); |
382 m_emulateViewportEnabled = false; | 384 m_emulateViewportEnabled = false; |
383 } | 385 } |
384 | 386 |
385 void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) | 387 void WebDevToolsAgentImpl::getAllocatedObjects(HashSet<const void*>& set) |
386 { | 388 { |
387 class CountingVisitor : public WebDevToolsAgentClient::AllocatedObjectVisito
r { | 389 class CountingVisitor : public WebDevToolsAgentClient::AllocatedObjectVisito
r { |
388 public: | 390 public: |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kProfiler_startCmd) | 668 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kProfiler_startCmd) |
667 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kProfiler_stopCmd); | 669 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kProfiler_stopCmd); |
668 } | 670 } |
669 | 671 |
670 void WebDevToolsAgent::processPendingMessages() | 672 void WebDevToolsAgent::processPendingMessages() |
671 { | 673 { |
672 PageScriptDebugServer::shared().runPendingTasks(); | 674 PageScriptDebugServer::shared().runPendingTasks(); |
673 } | 675 } |
674 | 676 |
675 } // namespace blink | 677 } // namespace blink |
OLD | NEW |