| 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 3487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3498 } | 3498 } |
| 3499 | 3499 |
| 3500 void RenderViewImpl::OnReleaseDisambiguationPopupBitmap( | 3500 void RenderViewImpl::OnReleaseDisambiguationPopupBitmap( |
| 3501 const cc::SharedBitmapId& id) { | 3501 const cc::SharedBitmapId& id) { |
| 3502 BitmapMap::iterator it = disambiguation_bitmaps_.find(id); | 3502 BitmapMap::iterator it = disambiguation_bitmaps_.find(id); |
| 3503 DCHECK(it != disambiguation_bitmaps_.end()); | 3503 DCHECK(it != disambiguation_bitmaps_.end()); |
| 3504 delete it->second; | 3504 delete it->second; |
| 3505 disambiguation_bitmaps_.erase(it); | 3505 disambiguation_bitmaps_.erase(it); |
| 3506 } | 3506 } |
| 3507 | 3507 |
| 3508 void RenderViewImpl::DidCommitCompositorFrame() { | |
| 3509 RenderWidget::DidCommitCompositorFrame(); | |
| 3510 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | |
| 3511 } | |
| 3512 | |
| 3513 void RenderViewImpl::SendUpdateFaviconURL(const std::vector<FaviconURL>& urls) { | 3508 void RenderViewImpl::SendUpdateFaviconURL(const std::vector<FaviconURL>& urls) { |
| 3514 if (!urls.empty()) | 3509 if (!urls.empty()) |
| 3515 Send(new ViewHostMsg_UpdateFaviconURL(routing_id(), urls)); | 3510 Send(new ViewHostMsg_UpdateFaviconURL(routing_id(), urls)); |
| 3516 } | 3511 } |
| 3517 | 3512 |
| 3518 void RenderViewImpl::DidStopLoadingIcons() { | 3513 void RenderViewImpl::DidStopLoadingIcons() { |
| 3519 int icon_types = WebIconURL::TypeFavicon | WebIconURL::TypeTouchPrecomposed | | 3514 int icon_types = WebIconURL::TypeFavicon | WebIconURL::TypeTouchPrecomposed | |
| 3520 WebIconURL::TypeTouch; | 3515 WebIconURL::TypeTouch; |
| 3521 | 3516 |
| 3522 // Favicons matter only for the top-level frame. If it is a WebRemoteFrame, | 3517 // Favicons matter only for the top-level frame. If it is a WebRemoteFrame, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 3545 if (IsUseZoomForDSFEnabled()) { | 3540 if (IsUseZoomForDSFEnabled()) { |
| 3546 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3541 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
| 3547 } else { | 3542 } else { |
| 3548 webview()->setDeviceScaleFactor(device_scale_factor_); | 3543 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3549 } | 3544 } |
| 3550 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3545 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3551 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3546 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 3552 } | 3547 } |
| 3553 | 3548 |
| 3554 } // namespace content | 3549 } // namespace content |
| OLD | NEW |