| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 , m_ignoreInputEvents(false) | 398 , m_ignoreInputEvents(false) |
| 399 , m_suppressNextKeypressEvent(false) | 399 , m_suppressNextKeypressEvent(false) |
| 400 , m_imeAcceptEvents(true) | 400 , m_imeAcceptEvents(true) |
| 401 , m_operationsAllowed(WebDragOperationNone) | 401 , m_operationsAllowed(WebDragOperationNone) |
| 402 , m_dragOperation(WebDragOperationNone) | 402 , m_dragOperation(WebDragOperationNone) |
| 403 , m_featureSwitchClient(adoptPtr(new ContextFeaturesClientImpl())) | 403 , m_featureSwitchClient(adoptPtr(new ContextFeaturesClientImpl())) |
| 404 , m_autofillPopupShowing(false) | 404 , m_autofillPopupShowing(false) |
| 405 , m_autofillPopup(0) | 405 , m_autofillPopup(0) |
| 406 , m_isTransparent(false) | 406 , m_isTransparent(false) |
| 407 , m_tabsToLinks(false) | 407 , m_tabsToLinks(false) |
| 408 , m_benchmarkSupport(this) | |
| 409 , m_layerTreeView(0) | 408 , m_layerTreeView(0) |
| 410 , m_rootLayer(0) | 409 , m_rootLayer(0) |
| 411 , m_rootGraphicsLayer(0) | 410 , m_rootGraphicsLayer(0) |
| 412 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) | 411 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) |
| 413 , m_isAcceleratedCompositingActive(false) | 412 , m_isAcceleratedCompositingActive(false) |
| 414 , m_layerTreeViewCommitsDeferred(false) | 413 , m_layerTreeViewCommitsDeferred(false) |
| 415 , m_compositorCreationFailed(false) | 414 , m_compositorCreationFailed(false) |
| 416 , m_recreatingGraphicsContext(false) | 415 , m_recreatingGraphicsContext(false) |
| 417 #if ENABLE(INPUT_SPEECH) | 416 #if ENABLE(INPUT_SPEECH) |
| 418 , m_speechInputClient(SpeechInputClientImpl::create(client)) | 417 , m_speechInputClient(SpeechInputClientImpl::create(client)) |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 m_layerTreeView->startPageScaleAnimation(targetPosition, useAnchor, newS
cale, durationInSeconds); | 840 m_layerTreeView->startPageScaleAnimation(targetPosition, useAnchor, newS
cale, durationInSeconds); |
| 842 } | 841 } |
| 843 return true; | 842 return true; |
| 844 } | 843 } |
| 845 | 844 |
| 846 void WebViewImpl::enableFakePageScaleAnimationForTesting(bool enable) | 845 void WebViewImpl::enableFakePageScaleAnimationForTesting(bool enable) |
| 847 { | 846 { |
| 848 m_enableFakePageScaleAnimationForTesting = enable; | 847 m_enableFakePageScaleAnimationForTesting = enable; |
| 849 } | 848 } |
| 850 | 849 |
| 851 WebViewBenchmarkSupport* WebViewImpl::benchmarkSupport() | |
| 852 { | |
| 853 return &m_benchmarkSupport; | |
| 854 } | |
| 855 | |
| 856 void WebViewImpl::setShowFPSCounter(bool show) | 850 void WebViewImpl::setShowFPSCounter(bool show) |
| 857 { | 851 { |
| 858 if (m_layerTreeView) { | 852 if (m_layerTreeView) { |
| 859 TRACE_EVENT0("webkit", "WebViewImpl::setShowFPSCounter"); | 853 TRACE_EVENT0("webkit", "WebViewImpl::setShowFPSCounter"); |
| 860 m_layerTreeView->setShowFPSCounter(show); | 854 m_layerTreeView->setShowFPSCounter(show); |
| 861 } | 855 } |
| 862 m_showFPSCounter = show; | 856 m_showFPSCounter = show; |
| 863 } | 857 } |
| 864 | 858 |
| 865 void WebViewImpl::setShowPaintRects(bool show) | 859 void WebViewImpl::setShowPaintRects(bool show) |
| (...skipping 3258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4124 } | 4118 } |
| 4125 | 4119 |
| 4126 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 4120 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 4127 { | 4121 { |
| 4128 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); | 4122 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); |
| 4129 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom | 4123 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom |
| 4130 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); | 4124 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); |
| 4131 } | 4125 } |
| 4132 | 4126 |
| 4133 } // namespace WebKit | 4127 } // namespace WebKit |
| OLD | NEW |