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

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

Issue 1836063003: rebase https://codereview.chromium.org/1484163002 Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2323 2323
2324 if (!cornerStyle) { 2324 if (!cornerStyle) {
2325 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also. 2325 // If we have an owning ipage/LocalFrame element, then it can set th e custom scrollbar also.
2326 if (LayoutPart* layoutObject = m_frame->ownerLayoutObject()) 2326 if (LayoutPart* layoutObject = m_frame->ownerLayoutObject())
2327 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRe quest(PseudoIdScrollbarCorner), layoutObject->style()); 2327 cornerStyle = layoutObject->getUncachedPseudoStyle(PseudoStyleRe quest(PseudoIdScrollbarCorner), layoutObject->style());
2328 } 2328 }
2329 } 2329 }
2330 2330
2331 if (cornerStyle) { 2331 if (cornerStyle) {
2332 if (!m_scrollCorner) 2332 if (!m_scrollCorner)
2333 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc); 2333 m_scrollCorner = LayoutScrollbarPart::createAnonymous(doc, this);
2334 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release()); 2334 m_scrollCorner->setStyleWithWritingModeOfParent(cornerStyle.release());
2335 setScrollCornerNeedsPaintInvalidation(); 2335 setScrollCornerNeedsPaintInvalidation();
2336 } else if (m_scrollCorner) { 2336 } else if (m_scrollCorner) {
2337 m_scrollCorner->destroy(); 2337 m_scrollCorner->destroy();
2338 m_scrollCorner = nullptr; 2338 m_scrollCorner = nullptr;
2339 } 2339 }
2340 } 2340 }
2341 2341
2342 Color FrameView::documentBackgroundColor() const 2342 Color FrameView::documentBackgroundColor() const
2343 { 2343 {
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
4092 return m_hiddenForThrottling && m_crossOriginForThrottling; 4092 return m_hiddenForThrottling && m_crossOriginForThrottling;
4093 } 4093 }
4094 4094
4095 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4095 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4096 { 4096 {
4097 ASSERT(layoutView()); 4097 ASSERT(layoutView());
4098 return *layoutView(); 4098 return *layoutView();
4099 } 4099 }
4100 4100
4101 } // namespace blink 4101 } // namespace blink
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | third_party/WebKit/Source/core/layout/LayoutScrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698