| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1477 frame->SendUpdateState(); | 1477 frame->SendUpdateState(); |
| 1478 } | 1478 } |
| 1479 frames_with_pending_state_.clear(); | 1479 frames_with_pending_state_.clear(); |
| 1480 } | 1480 } |
| 1481 | 1481 |
| 1482 void RenderViewImpl::ApplyWebPreferencesInternal( | 1482 void RenderViewImpl::ApplyWebPreferencesInternal( |
| 1483 const WebPreferences& prefs, | 1483 const WebPreferences& prefs, |
| 1484 blink::WebView* web_view, | 1484 blink::WebView* web_view, |
| 1485 CompositorDependencies* compositor_deps) { | 1485 CompositorDependencies* compositor_deps) { |
| 1486 ApplyWebPreferences(prefs, web_view); | 1486 ApplyWebPreferences(prefs, web_view); |
| 1487 #if defined(OS_MACOSX) | |
| 1488 DCHECK(compositor_deps); | |
| 1489 bool is_elastic_overscroll_enabled = | |
| 1490 compositor_deps->IsElasticOverscrollEnabled(); | |
| 1491 web_view->settings()->setReportWheelOverscroll(is_elastic_overscroll_enabled); | |
| 1492 #endif | |
| 1493 } | 1487 } |
| 1494 | 1488 |
| 1495 bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) { | 1489 bool RenderViewImpl::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) { |
| 1496 // Before WebKit asks us to show an alert (etc.), it takes care of doing the | 1490 // Before WebKit asks us to show an alert (etc.), it takes care of doing the |
| 1497 // equivalent of WebView::willEnterModalLoop. In the case of showModalDialog | 1491 // equivalent of WebView::willEnterModalLoop. In the case of showModalDialog |
| 1498 // it is particularly important that we do not call willEnterModalLoop as | 1492 // it is particularly important that we do not call willEnterModalLoop as |
| 1499 // that would defer resource loads for the dialog itself. | 1493 // that would defer resource loads for the dialog itself. |
| 1500 if (RenderThreadImpl::current()) // Will be NULL during unit tests. | 1494 if (RenderThreadImpl::current()) // Will be NULL during unit tests. |
| 1501 RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop(); | 1495 RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop(); |
| 1502 | 1496 |
| (...skipping 1820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3323 if (IsUseZoomForDSFEnabled()) { | 3317 if (IsUseZoomForDSFEnabled()) { |
| 3324 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3318 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
| 3325 } else { | 3319 } else { |
| 3326 webview()->setDeviceScaleFactor(device_scale_factor_); | 3320 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3327 } | 3321 } |
| 3328 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3322 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3329 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3323 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 3330 } | 3324 } |
| 3331 | 3325 |
| 3332 } // namespace content | 3326 } // namespace content |
| OLD | NEW |