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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 16048003: Fix race between DPI and window size (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months 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 | Annotate | Revision Log
OLDNEW
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 5582 matching lines...) Expand 10 before | Expand all | Expand 10 after
5593 // If we failed to download the alternate error page, LoadNavigationErrorPage 5593 // If we failed to download the alternate error page, LoadNavigationErrorPage
5594 // will simply display a default error page. 5594 // will simply display a default error page.
5595 LoadNavigationErrorPage(frame, original_request, original_error, html, true); 5595 LoadNavigationErrorPage(frame, original_request, original_error, html, true);
5596 } 5596 }
5597 5597
5598 void RenderViewImpl::OnMoveOrResizeStarted() { 5598 void RenderViewImpl::OnMoveOrResizeStarted() {
5599 if (webview()) 5599 if (webview())
5600 webview()->hidePopups(); 5600 webview()->hidePopups();
5601 } 5601 }
5602 5602
5603 void RenderViewImpl::OnResize(const gfx::Size& new_size, 5603 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) {
5604 const gfx::Size& physical_backing_size,
5605 float overdraw_bottom_height,
5606 const gfx::Rect& resizer_rect,
5607 bool is_fullscreen) {
5608 if (webview()) { 5604 if (webview()) {
5609 webview()->hidePopups(); 5605 webview()->hidePopups();
5610 if (send_preferred_size_changes_) { 5606 if (send_preferred_size_changes_) {
5611 webview()->mainFrame()->setCanHaveScrollbars( 5607 webview()->mainFrame()->setCanHaveScrollbars(
5612 ShouldDisplayScrollbars(new_size.width(), new_size.height())); 5608 ShouldDisplayScrollbars(params.new_size.width(),
5609 params.new_size.height()));
5613 } 5610 }
5614 UpdateScrollState(webview()->mainFrame()); 5611 UpdateScrollState(webview()->mainFrame());
5615 } 5612 }
5616 5613
5617 RenderWidget::OnResize(new_size, physical_backing_size, 5614 RenderWidget::OnResize(params);
5618 overdraw_bottom_height, resizer_rect, is_fullscreen);
5619 } 5615 }
5620 5616
5621 void RenderViewImpl::WillInitiatePaint() { 5617 void RenderViewImpl::WillInitiatePaint() {
5622 // Notify the pepper plugins that we're about to paint. 5618 // Notify the pepper plugins that we're about to paint.
5623 pepper_helper_->ViewWillInitiatePaint(); 5619 pepper_helper_->ViewWillInitiatePaint();
5624 } 5620 }
5625 5621
5626 void RenderViewImpl::DidInitiatePaint() { 5622 void RenderViewImpl::DidInitiatePaint() {
5627 // Notify the pepper plugins that we've painted, and are waiting to flush. 5623 // Notify the pepper plugins that we've painted, and are waiting to flush.
5628 pepper_helper_->ViewInitiatedPaint(); 5624 pepper_helper_->ViewInitiatedPaint();
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after
6555 WebURL url = icon_urls[i].iconURL(); 6551 WebURL url = icon_urls[i].iconURL();
6556 if (!url.isEmpty()) 6552 if (!url.isEmpty())
6557 urls.push_back(FaviconURL(url, 6553 urls.push_back(FaviconURL(url,
6558 ToFaviconType(icon_urls[i].iconType()))); 6554 ToFaviconType(icon_urls[i].iconType())));
6559 } 6555 }
6560 SendUpdateFaviconURL(urls); 6556 SendUpdateFaviconURL(urls);
6561 } 6557 }
6562 6558
6563 6559
6564 } // namespace content 6560 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698