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

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: path for re-landing try #2 with removed unnecessary comment Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.cpp ('k') | Source/core/rendering/RenderObject.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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 horizontalScrollbar->setFrameRect(hBarRect); 858 horizontalScrollbar->setFrameRect(hBarRect);
859 } 859 }
860 860
861 const IntRect& scrollCorner = scrollCornerRect(); 861 const IntRect& scrollCorner = scrollCornerRect();
862 if (m_scrollCorner) 862 if (m_scrollCorner)
863 m_scrollCorner->setFrameRect(scrollCorner); 863 m_scrollCorner->setFrameRect(scrollCorner);
864 864
865 if (m_resizer) 865 if (m_resizer)
866 m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer)) ; 866 m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer)) ;
867 867
868 if (m_box->isComposited()) 868 if (m_box->compositedLayerMapping())
869 layer()->compositedLayerMapping()->positionOverflowControlsLayers(offset FromRoot); 869 layer()->compositedLayerMapping()->positionOverflowControlsLayers(offset FromRoot);
870 } 870 }
871 871
872 void RenderLayerScrollableArea::updateScrollCornerStyle() 872 void RenderLayerScrollableArea::updateScrollCornerStyle()
873 { 873 {
874 RenderObject* actualRenderer = rendererForScrollbar(m_box); 874 RenderObject* actualRenderer = rendererForScrollbar(m_box);
875 RefPtr<RenderStyle> corner = m_box->hasOverflowClip() ? actualRenderer->getU ncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style() ) : PassRefPtr<RenderStyle>(0); 875 RefPtr<RenderStyle> corner = m_box->hasOverflowClip() ? actualRenderer->getU ncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style() ) : PassRefPtr<RenderStyle>(0);
876 if (corner) { 876 if (corner) {
877 if (!m_scrollCorner) { 877 if (!m_scrollCorner) {
878 m_scrollCorner = RenderScrollbarPart::createAnonymous(&m_box->docume nt()); 878 m_scrollCorner = RenderScrollbarPart::createAnonymous(&m_box->docume nt());
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 baseHeight = baseHeight / zoomFactor; 1264 baseHeight = baseHeight / zoomFactor;
1265 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX); 1265 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX);
1266 } 1266 }
1267 1267
1268 document.updateLayout(); 1268 document.updateLayout();
1269 1269
1270 // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view. 1270 // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view.
1271 } 1271 }
1272 1272
1273 } // Namespace WebCore 1273 } // Namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerRepainter.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698