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

Side by Side Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 392403003: Remove unneeded break in CompositedLayerMapping::containingSquashedLayer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add braces Created 6 years, 5 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 | « no previous file | 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 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 1928
1929 SetContentsNeedsDisplayInRectFunctor functor = { 1929 SetContentsNeedsDisplayInRectFunctor functor = {
1930 pixelSnappedIntRect(r.location() + m_owningLayer.subpixelAccumulation(), r.size()) 1930 pixelSnappedIntRect(r.location() + m_owningLayer.subpixelAccumulation(), r.size())
1931 }; 1931 };
1932 ApplyToGraphicsLayers(this, functor, ApplyToContentLayers); 1932 ApplyToGraphicsLayers(this, functor, ApplyToContentLayers);
1933 } 1933 }
1934 1934
1935 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(co nst RenderObject* renderObject, const Vector<GraphicsLayerPaintInfo>& layers) 1935 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(co nst RenderObject* renderObject, const Vector<GraphicsLayerPaintInfo>& layers)
1936 { 1936 {
1937 for (size_t i = 0; i < layers.size(); ++i) { 1937 for (size_t i = 0; i < layers.size(); ++i) {
1938 if (renderObject->isDescendantOf(layers[i].renderLayer->renderer())) { 1938 if (renderObject->isDescendantOf(layers[i].renderLayer->renderer()))
1939 return &layers[i]; 1939 return &layers[i];
1940 break;
1941 }
1942 } 1940 }
1943 return 0; 1941 return 0;
1944 } 1942 }
1945 1943
1946 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(co nst RenderObject* renderObject) 1944 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(co nst RenderObject* renderObject)
1947 { 1945 {
1948 return CompositedLayerMapping::containingSquashedLayer(renderObject, m_squas hedLayers); 1946 return CompositedLayerMapping::containingSquashedLayer(renderObject, m_squas hedLayers);
1949 } 1947 }
1950 1948
1951 IntRect CompositedLayerMapping::localClipRectForSquashedLayer(const RenderLayer& referenceLayer, const GraphicsLayerPaintInfo& paintInfo, const Vector<GraphicsL ayerPaintInfo>& layers) 1949 IntRect CompositedLayerMapping::localClipRectForSquashedLayer(const RenderLayer& referenceLayer, const GraphicsLayerPaintInfo& paintInfo, const Vector<GraphicsL ayerPaintInfo>& layers)
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2241 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2244 name = "Scrolling Block Selection Layer"; 2242 name = "Scrolling Block Selection Layer";
2245 } else { 2243 } else {
2246 ASSERT_NOT_REACHED(); 2244 ASSERT_NOT_REACHED();
2247 } 2245 }
2248 2246
2249 return name; 2247 return name;
2250 } 2248 }
2251 2249
2252 } // namespace WebCore 2250 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698