Changeset 122619 in webkit
- Timestamp:
- Jul 13, 2012 12:40:30 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r122616 r122619 1 2012-07-13 Shawn Singh <shawnsingh@chromium.org> 2 3 [chromium] Remove incorrect debug assertion in LayerRendererChromium.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=91260 5 6 Reviewed by Adrienne Walker. 7 8 ASSERT(!clipped) was being triggered after skinny almost-degenerate 9 quads went through anti-aliasing inflation, and then were being 10 transformed back from device space to local space. It turns out 11 this assertion is too aggressive, and we don't yet have an obvious 12 need to change the behavior on the clipped==true case. 13 14 No new tests needed, this patch fixes only comments and debug code. 15 16 * platform/graphics/chromium/LayerRendererChromium.cpp: 17 (WebCore::LayerRendererChromium::drawRenderPassQuad): 18 fixed a comment. 19 20 (WebCore::LayerRendererChromium::drawTileQuad): 21 fixed a similar comment, removed unnecessary assertion. 22 1 23 2012-07-13 Philip Rogers <pdr@google.com> 2 24 -
trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
r122525 r122619 700 700 } 701 701 702 // Map device space quad to surface space. contentsDeviceTransform has no perspectivesince it was generated with to2dTransform() so we don't need to project.702 // Map device space quad to surface space. contentsDeviceTransform has no 3d component since it was generated with to2dTransform() so we don't need to project. 703 703 FloatQuad surfaceQuad = CCMathUtil::mapQuad(contentsDeviceTransform.inverse(), deviceLayerEdges.floatQuad(), clipped); 704 704 ASSERT(!clipped); … … 880 880 CCLayerQuad deviceQuad(leftEdge, topEdge, rightEdge, bottomEdge); 881 881 882 // Map quad to layer space.882 // Map device space quad to local space. contentsDeviceTransform has no 3d component since it was generated with to2dTransform() so we don't need to project. 883 883 WebTransformationMatrix inverseDeviceTransform = deviceTransform.inverse(); 884 884 localQuad = CCMathUtil::mapQuad(inverseDeviceTransform, deviceQuad.floatQuad(), clipped); 885 ASSERT(!clipped); 885 886 // We should not ASSERT(!clipped) here, because anti-aliasing inflation may cause deviceQuad to become 887 // clipped. To our knowledge this scenario does not need to be handled differently than the unclipped case. 886 888 } else { 887 889 // Move fragment shader transform to vertex shader. We can do this while
Note: See TracChangeset
for help on using the changeset viewer.