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

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

Issue 260353003: isActiveFocus() is a more meaningful name (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/PinchViewport.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 /* 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 2288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2299 2299
2300 // FIXME: childrenClipRect relies on compositingState, which is not necessar ily up to date. 2300 // FIXME: childrenClipRect relies on compositingState, which is not necessar ily up to date.
2301 // https://code.google.com/p/chromium/issues/detail?id=343769 2301 // https://code.google.com/p/chromium/issues/detail?id=343769
2302 DisableCompositingQueryAsserts disabler; 2302 DisableCompositingQueryAsserts disabler;
2303 2303
2304 // Apply the clip from the layer. 2304 // Apply the clip from the layer.
2305 IntRect clipRect = contentsToWindow(pixelSnappedIntRect(enclosingLayer->clip per().childrenClipRect())); 2305 IntRect clipRect = contentsToWindow(pixelSnappedIntRect(enclosingLayer->clip per().childrenClipRect()));
2306 return intersection(clipRect, windowClipRect()); 2306 return intersection(clipRect, windowClipRect());
2307 } 2307 }
2308 2308
2309 bool FrameView::isActive() const 2309 bool FrameView::isActiveFocus() const
2310 { 2310 {
2311 Page* page = frame().page(); 2311 Page* page = frame().page();
2312 return page && page->focusController().isActive(); 2312 return page && page->focusController().isActive();
2313 } 2313 }
2314 2314
2315 void FrameView::scrollTo(const IntSize& newOffset) 2315 void FrameView::scrollTo(const IntSize& newOffset)
2316 { 2316 {
2317 LayoutSize offset = scrollOffset(); 2317 LayoutSize offset = scrollOffset();
2318 ScrollView::scrollTo(newOffset); 2318 ScrollView::scrollTo(newOffset);
2319 if (offset != scrollOffset()) { 2319 if (offset != scrollOffset()) {
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
3250 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3250 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3251 { 3251 {
3252 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3252 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3253 if (AXObjectCache* cache = axObjectCache()) { 3253 if (AXObjectCache* cache = axObjectCache()) {
3254 cache->remove(scrollbar); 3254 cache->remove(scrollbar);
3255 cache->handleScrollbarUpdate(this); 3255 cache->handleScrollbarUpdate(this);
3256 } 3256 }
3257 } 3257 }
3258 3258
3259 } // namespace WebCore 3259 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698