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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 661793002: Oilpan: fix build after r183816 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Non-Oilpan compile fix Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2371 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 result = result.blend(htmlElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor)); 2382 result = result.blend(htmlElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor));
2383 if (bodyElement && bodyElement->renderer()) 2383 if (bodyElement && bodyElement->renderer())
2384 result = result.blend(bodyElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor)); 2384 result = result.blend(bodyElement->renderer()->style()->visitedDependent Color(CSSPropertyBackgroundColor));
2385 2385
2386 return result; 2386 return result;
2387 } 2387 }
2388 2388
2389 bool FrameView::hasCustomScrollbars() const 2389 bool FrameView::hasCustomScrollbars() const
2390 { 2390 {
2391 const ChildrenWidgetSet* viewChildren = children(); 2391 const ChildrenWidgetSet* viewChildren = children();
2392 for (const auto& child : *viewChildren) { 2392 for (const RefPtrWillBeMember<Widget>& child : *viewChildren) {
2393 Widget* widget = child.get(); 2393 Widget* widget = child.get();
2394 if (widget->isFrameView()) { 2394 if (widget->isFrameView()) {
2395 if (toFrameView(widget)->hasCustomScrollbars()) 2395 if (toFrameView(widget)->hasCustomScrollbars())
2396 return true; 2396 return true;
2397 } else if (widget->isScrollbar()) { 2397 } else if (widget->isScrollbar()) {
2398 Scrollbar* scrollbar = static_cast<Scrollbar*>(widget); 2398 if (toScrollbar(widget)->isCustomScrollbar())
2399 if (scrollbar->isCustomScrollbar())
2400 return true; 2399 return true;
2401 } 2400 }
2402 } 2401 }
2403 2402
2404 return false; 2403 return false;
2405 } 2404 }
2406 2405
2407 FrameView* FrameView::parentFrameView() const 2406 FrameView* FrameView::parentFrameView() const
2408 { 2407 {
2409 if (!parent()) 2408 if (!parent())
(...skipping 1594 matching lines...) Expand 10 before | Expand all | Expand 10 after
4004 return; 4003 return;
4005 4004
4006 ScrollableArea::setScrollOrigin(origin); 4005 ScrollableArea::setScrollOrigin(origin);
4007 4006
4008 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4007 // Update if the scroll origin changes, since our position will be different if the content size did not change.
4009 if (updatePositionAtAll && updatePositionSynchronously) 4008 if (updatePositionAtAll && updatePositionSynchronously)
4010 updateScrollbars(scrollOffsetDouble()); 4009 updateScrollbars(scrollOffsetDouble());
4011 } 4010 }
4012 4011
4013 } // namespace blink 4012 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698