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

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: Remove semicolon Created 7 years, 6 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5585 matching lines...) Expand 10 before | Expand all | Expand 10 after
5596 // If we failed to download the alternate error page, LoadNavigationErrorPage 5596 // If we failed to download the alternate error page, LoadNavigationErrorPage
5597 // will simply display a default error page. 5597 // will simply display a default error page.
5598 LoadNavigationErrorPage(frame, original_request, original_error, html, true); 5598 LoadNavigationErrorPage(frame, original_request, original_error, html, true);
5599 } 5599 }
5600 5600
5601 void RenderViewImpl::OnMoveOrResizeStarted() { 5601 void RenderViewImpl::OnMoveOrResizeStarted() {
5602 if (webview()) 5602 if (webview())
5603 webview()->hidePopups(); 5603 webview()->hidePopups();
5604 } 5604 }
5605 5605
5606 void RenderViewImpl::OnResize(const gfx::Size& new_size, 5606 void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) {
5607 const gfx::Size& physical_backing_size,
5608 float overdraw_bottom_height,
5609 const gfx::Rect& resizer_rect,
5610 bool is_fullscreen) {
5611 if (webview()) { 5607 if (webview()) {
5612 webview()->hidePopups(); 5608 webview()->hidePopups();
5613 if (send_preferred_size_changes_) { 5609 if (send_preferred_size_changes_) {
5614 webview()->mainFrame()->setCanHaveScrollbars( 5610 webview()->mainFrame()->setCanHaveScrollbars(
5615 ShouldDisplayScrollbars(new_size.width(), new_size.height())); 5611 ShouldDisplayScrollbars(params.new_size.width(),
5612 params.new_size.height()));
5616 } 5613 }
5617 UpdateScrollState(webview()->mainFrame()); 5614 UpdateScrollState(webview()->mainFrame());
5618 } 5615 }
5619 5616
5620 RenderWidget::OnResize(new_size, physical_backing_size, 5617 RenderWidget::OnResize(params);
5621 overdraw_bottom_height, resizer_rect, is_fullscreen);
5622 } 5618 }
5623 5619
5624 void RenderViewImpl::WillInitiatePaint() { 5620 void RenderViewImpl::WillInitiatePaint() {
5625 // Notify the pepper plugins that we're about to paint. 5621 // Notify the pepper plugins that we're about to paint.
5626 pepper_helper_->ViewWillInitiatePaint(); 5622 pepper_helper_->ViewWillInitiatePaint();
5627 } 5623 }
5628 5624
5629 void RenderViewImpl::DidInitiatePaint() { 5625 void RenderViewImpl::DidInitiatePaint() {
5630 // Notify the pepper plugins that we've painted, and are waiting to flush. 5626 // Notify the pepper plugins that we've painted, and are waiting to flush.
5631 pepper_helper_->ViewInitiatedPaint(); 5627 pepper_helper_->ViewInitiatedPaint();
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
6560 WebURL url = icon_urls[i].iconURL(); 6556 WebURL url = icon_urls[i].iconURL();
6561 if (!url.isEmpty()) 6557 if (!url.isEmpty())
6562 urls.push_back(FaviconURL(url, 6558 urls.push_back(FaviconURL(url,
6563 ToFaviconType(icon_urls[i].iconType()))); 6559 ToFaviconType(icon_urls[i].iconType())));
6564 } 6560 }
6565 SendUpdateFaviconURL(urls); 6561 SendUpdateFaviconURL(urls);
6566 } 6562 }
6567 6563
6568 6564
6569 } // namespace content 6565 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698