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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/GraphicsLayerTreeBuilder.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Google Inc. All rights reserved. 3 * Copyright (C) 2014 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 if (!parented) 101 if (!parented)
102 currentCompositedLayerMapping->setSublayers(layerChildren); 102 currentCompositedLayerMapping->setSublayers(layerChildren);
103 103
104 if (shouldAppendLayer(layer)) 104 if (shouldAppendLayer(layer))
105 info.childLayersOfEnclosingCompositedLayer->append(currentComposited LayerMapping->childForSuperlayers()); 105 info.childLayersOfEnclosingCompositedLayer->append(currentComposited LayerMapping->childForSuperlayers());
106 } 106 }
107 107
108 if (layer.scrollParent() 108 if (layer.scrollParent()
109 && layer.scrollParent()->hasCompositedLayerMapping() 109 && layer.scrollParent()->hasCompositedLayerMapping()
110 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl owControls() 110 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl owControls()
111 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye r) 111 && layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &l ayer)
112 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer)); 112 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer));
113 } 113 }
114 114
115 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698