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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2021343003: MD Site Settings: Add five new top level categories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 1616
1617 // Update our knowledge of the RenderWidget's size. 1617 // Update our knowledge of the RenderWidget's size.
1618 current_size_ = params.view_size; 1618 current_size_ = params.view_size;
1619 1619
1620 bool is_resize_ack = 1620 bool is_resize_ack =
1621 ViewHostMsg_UpdateRect_Flags::is_resize_ack(params.flags); 1621 ViewHostMsg_UpdateRect_Flags::is_resize_ack(params.flags);
1622 1622
1623 // resize_ack_pending_ needs to be cleared before we call DidPaintRect, since 1623 // resize_ack_pending_ needs to be cleared before we call DidPaintRect, since
1624 // that will end up reaching GetBackingStore. 1624 // that will end up reaching GetBackingStore.
1625 if (is_resize_ack) { 1625 if (is_resize_ack) {
1626 DCHECK(!g_check_for_pending_resize_ack || resize_ack_pending_); 1626 //DCHECK(!g_check_for_pending_resize_ack || resize_ack_pending_);
1627 resize_ack_pending_ = false; 1627 resize_ack_pending_ = false;
1628 } 1628 }
1629 1629
1630 bool is_repaint_ack = 1630 bool is_repaint_ack =
1631 ViewHostMsg_UpdateRect_Flags::is_repaint_ack(params.flags); 1631 ViewHostMsg_UpdateRect_Flags::is_repaint_ack(params.flags);
1632 if (is_repaint_ack) { 1632 if (is_repaint_ack) {
1633 DCHECK(repaint_ack_pending_); 1633 DCHECK(repaint_ack_pending_);
1634 TRACE_EVENT_ASYNC_END0( 1634 TRACE_EVENT_ASYNC_END0(
1635 "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this); 1635 "renderer_host", "RenderWidgetHostImpl::repaint_ack_pending_", this);
1636 repaint_ack_pending_ = false; 1636 repaint_ack_pending_ = false;
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; 2164 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL;
2165 } 2165 }
2166 2166
2167 BrowserAccessibilityManager* 2167 BrowserAccessibilityManager*
2168 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { 2168 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() {
2169 return delegate_ ? 2169 return delegate_ ?
2170 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; 2170 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL;
2171 } 2171 }
2172 2172
2173 } // namespace content 2173 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698