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

Side by Side Diff: Source/WebCore/rendering/RenderLayerBacking.cpp

Issue 10536221: Merge 120750 - Fix scrollbar layers being misplaced with a clipped owner layer (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 6 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 | « LayoutTests/compositing/overflow/scrollbars-with-clipped-owner-expected.txt ('k') | no next file » | 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) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 for (RenderLayer* curr = layer; curr; curr = curr->parent()) { 237 for (RenderLayer* curr = layer; curr; curr = curr->parent()) {
238 if (curr->hasTransform()) 238 if (curr->hasTransform())
239 return true; 239 return true;
240 } 240 }
241 241
242 return false; 242 return false;
243 } 243 }
244 244
245 bool RenderLayerBacking::shouldClipCompositedBounds() const 245 bool RenderLayerBacking::shouldClipCompositedBounds() const
246 { 246 {
247 // Scrollbar layers use this layer for relative positioning, so don't clip.
248 if (layerForHorizontalScrollbar() || layerForVerticalScrollbar())
249 return false;
250
247 if (m_usingTiledCacheLayer) 251 if (m_usingTiledCacheLayer)
248 return true; 252 return true;
249 253
250 if (!compositor()->compositingConsultsOverlap()) 254 if (!compositor()->compositingConsultsOverlap())
251 return false; 255 return false;
252 256
253 if (layerOrAncestorIsTransformed(m_owningLayer)) 257 if (layerOrAncestorIsTransformed(m_owningLayer))
254 return false; 258 return false;
255 259
256 return true; 260 return true;
(...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 1580
1577 if (m_layerForScrollCorner) 1581 if (m_layerForScrollCorner)
1578 backingArea += m_layerForScrollCorner->backingStoreArea(); 1582 backingArea += m_layerForScrollCorner->backingStoreArea();
1579 1583
1580 return backingArea; 1584 return backingArea;
1581 } 1585 }
1582 1586
1583 } // namespace WebCore 1587 } // namespace WebCore
1584 1588
1585 #endif // USE(ACCELERATED_COMPOSITING) 1589 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « LayoutTests/compositing/overflow/scrollbars-with-clipped-owner-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698