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

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

Issue 1830333002: Correct visual rects for scroll corner/resizer and non-frame composited scroll bars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a LayoutScrollbartPart if we've no scrollable area. Created 4 years, 8 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 /* 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 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2313 2313
2314 if (!cornerStyle) { 2314 if (!cornerStyle) {
2315 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also. 2315 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also.
2316 if (LayoutPart* layoutObject = m_frame->ownerLayoutObject()) 2316 if (LayoutPart* layoutObject = m_frame->ownerLayoutObject())
2317 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRe quest(PseudoIdScrollbarCorner), layoutObject->style()); 2317 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRe quest(PseudoIdScrollbarCorner), layoutObject->style());
2318 } 2318 }
2319 } 2319 }
2320 2320
2321 if (cornerStyle) { 2321 if (cornerStyle) {
2322 if (!m_scrollCorner) 2322 if (!m_scrollCorner)
2323 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc); 2323 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc, this);
2324 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release()); 2324 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release());
2325 setScrollCornerNeedsPaintInvalidation(); 2325 setScrollCornerNeedsPaintInvalidation();
2326 } else if (m_scrollCorner) { 2326 } else if (m_scrollCorner) {
2327 m_scrollCorner->destroy(); 2327 m_scrollCorner->destroy();
2328 m_scrollCorner = nullptr; 2328 m_scrollCorner = nullptr;
2329 } 2329 }
2330 } 2330 }
2331 2331
2332 Color FrameView::documentBackgroundColor() const 2332 Color FrameView::documentBackgroundColor() const
2333 { 2333 {
(...skipping 1757 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 return m_hiddenForThrottling && m_crossOriginForThrottling; 4091 return m_hiddenForThrottling && m_crossOriginForThrottling;
4092 } 4092 }
4093 4093
4094 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4094 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4095 { 4095 {
4096 ASSERT(layoutView()); 4096 ASSERT(layoutView());
4097 return *layoutView(); 4097 return *layoutView();
4098 } 4098 }
4099 4099
4100 } // namespace blink 4100 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698