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

Side by Side Diff: Source/WebCore/page/FrameView.cpp

Issue 7810012: Merge 94107 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 3 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 | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/rendering/RenderBox.cpp » ('j') | 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 2428 matching lines...) Expand 10 before | Expand all | Expand 10 after
2439 } else if (widget->isScrollbar()) { 2439 } else if (widget->isScrollbar()) {
2440 Scrollbar* scrollbar = static_cast<Scrollbar*>(widget); 2440 Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);
2441 if (scrollbar->isCustomScrollbar()) 2441 if (scrollbar->isCustomScrollbar())
2442 return true; 2442 return true;
2443 } 2443 }
2444 } 2444 }
2445 2445
2446 return false; 2446 return false;
2447 } 2447 }
2448 2448
2449 void FrameView::clearOwningRendererForCustomScrollbars(RenderBox* box)
2450 {
2451 const HashSet<RefPtr<Widget> >* viewChildren = children();
2452 HashSet<RefPtr<Widget> >::const_iterator end = viewChildren->end();
2453 for (HashSet<RefPtr<Widget> >::const_iterator current = viewChildren->begin( ); current != end; ++current) {
2454 Widget* widget = current->get();
2455 if (widget->isScrollbar()) {
2456 Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);
2457 if (scrollbar->isCustomScrollbar()) {
2458 RenderScrollbar* customScrollbar = toRenderScrollbar(scrollbar);
2459 if (customScrollbar->owningRenderer() == box)
2460 customScrollbar->clearOwningRenderer();
2461 }
2462 }
2463 }
2464 }
2465
2449 FrameView* FrameView::parentFrameView() const 2466 FrameView* FrameView::parentFrameView() const
2450 { 2467 {
2451 if (Widget* parentView = parent()) { 2468 if (Widget* parentView = parent()) {
2452 if (parentView->isFrameView()) 2469 if (parentView->isFrameView())
2453 return static_cast<FrameView*>(parentView); 2470 return static_cast<FrameView*>(parentView);
2454 } 2471 }
2455 return 0; 2472 return 0;
2456 } 2473 }
2457 2474
2458 void FrameView::updateControlTints() 2475 void FrameView::updateControlTints()
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2932 } 2949 }
2933 2950
2934 AXObjectCache* FrameView::axObjectCache() const 2951 AXObjectCache* FrameView::axObjectCache() const
2935 { 2952 {
2936 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts()) 2953 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts())
2937 return frame()->document()->axObjectCache(); 2954 return frame()->document()->axObjectCache();
2938 return 0; 2955 return 0;
2939 } 2956 }
2940 2957
2941 } // namespace WebCore 2958 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698