Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(137)

Delta Between Two Patch Sets: Source/WebCore/rendering/RenderLayerBacking.cpp

Issue 7625051: Layer squashing prototype
Left Patch Set: correct diff Created 11 years, 12 months ago
Right Patch Set: bitwise OR did fix known bug Created 11 years, 12 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « Source/WebCore/rendering/RenderLayerBacking.h ('k') | Source/WebCore/rendering/RenderLayerCompositor.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 if (!m_backgroundLayer) 1373 if (!m_backgroundLayer)
1374 phase |= GraphicsLayerPaintBackground; 1374 phase |= GraphicsLayerPaintBackground;
1375 if (!m_foregroundLayer) 1375 if (!m_foregroundLayer)
1376 phase |= GraphicsLayerPaintForeground; 1376 phase |= GraphicsLayerPaintForeground;
1377 if (!m_overlapLayer) 1377 if (!m_overlapLayer)
1378 phase |= GraphicsLayerPaintOverlap; 1378 phase |= GraphicsLayerPaintOverlap;
1379 if (!m_maskLayer) 1379 if (!m_maskLayer)
1380 phase |= GraphicsLayerPaintMask; 1380 phase |= GraphicsLayerPaintMask;
1381 1381
1382 if (m_scrollingContentsLayer) { 1382 if (m_scrollingContentsLayer) {
1383 phase &= ~(GraphicsLayerPaintForeground & GraphicsLayerPaintOverlap); 1383 phase &= ~(GraphicsLayerPaintForeground | GraphicsLayerPaintOverlap);
shawnsingh 2013/03/21 05:01:02 Actually I think this should be bitwise OR | inst
1384 phase |= GraphicsLayerPaintCompositedScroll; 1384 phase |= GraphicsLayerPaintCompositedScroll;
1385 } 1385 }
1386 1386
1387 return static_cast<GraphicsLayerPaintingPhase>(phase); 1387 return static_cast<GraphicsLayerPaintingPhase>(phase);
1388 } 1388 }
1389 1389
1390 float RenderLayerBacking::compositingOpacity(float rendererOpacity) const 1390 float RenderLayerBacking::compositingOpacity(float rendererOpacity) const
1391 { 1391 {
1392 float finalOpacity = rendererOpacity; 1392 float finalOpacity = rendererOpacity;
1393 ···· 1393 ····
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
2355 info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar") ; 2355 info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar") ;
2356 info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar"); 2356 info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar");
2357 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); 2357 info.addMember(m_layerForScrollCorner, "layerForScrollCorner");
2358 info.addMember(m_scrollingLayer, "scrollingLayer"); 2358 info.addMember(m_scrollingLayer, "scrollingLayer");
2359 info.addMember(m_scrollingContentsLayer, "scrollingContentsLayer"); 2359 info.addMember(m_scrollingContentsLayer, "scrollingContentsLayer");
2360 } 2360 }
2361 2361
2362 } // namespace WebCore 2362 } // namespace WebCore
2363 2363
2364 #endif // USE(ACCELERATED_COMPOSITING) 2364 #endif // USE(ACCELERATED_COMPOSITING)
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b