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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 * 7 *
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "cc/CCRenderPass.h" 28 #include "cc/CCRenderPass.h"
29 29
30 #include "Color.h"
30 #include "cc/CCDamageTracker.h" 31 #include "cc/CCDamageTracker.h"
31 #include "cc/CCDebugBorderDrawQuad.h" 32 #include "cc/CCDebugBorderDrawQuad.h"
32 #include "cc/CCLayerImpl.h" 33 #include "cc/CCLayerImpl.h"
33 #include "cc/CCQuadCuller.h" 34 #include "cc/CCQuadCuller.h"
34 #include "cc/CCRenderSurfaceDrawQuad.h" 35 #include "cc/CCRenderSurfaceDrawQuad.h"
35 #include "cc/CCSharedQuadState.h" 36 #include "cc/CCSharedQuadState.h"
37 #include "cc/CCSolidColorDrawQuad.h"
36 38
37 namespace WebCore { 39 namespace WebCore {
38 40
39 static const int debugSurfaceBorderWidth = 2; 41 static const int debugSurfaceBorderWidth = 2;
40 static const int debugSurfaceBorderAlpha = 100; 42 static const int debugSurfaceBorderAlpha = 100;
41 static const int debugSurfaceBorderColorRed = 0; 43 static const int debugSurfaceBorderColorRed = 0;
42 static const int debugSurfaceBorderColorGreen = 0; 44 static const int debugSurfaceBorderColorGreen = 0;
43 static const int debugSurfaceBorderColorBlue = 255; 45 static const int debugSurfaceBorderColorBlue = 255;
44 static const int debugReplicaBorderColorRed = 160; 46 static const int debugReplicaBorderColorRed = 160;
45 static const int debugReplicaBorderColorGreen = 0; 47 static const int debugReplicaBorderColorGreen = 0;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 Color color(debugReplicaBorderColorRed, debugReplicaBorderColorGreen , debugReplicaBorderColorBlue, debugSurfaceBorderAlpha); 83 Color color(debugReplicaBorderColorRed, debugReplicaBorderColorGreen , debugReplicaBorderColorBlue, debugSurfaceBorderAlpha);
82 m_quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState.get( ), surface->contentRect(), color, debugSurfaceBorderWidth)); 84 m_quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState.get( ), surface->contentRect(), color, debugSurfaceBorderWidth));
83 m_sharedQuadStateList.append(sharedQuadState.release()); 85 m_sharedQuadStateList.append(sharedQuadState.release());
84 } 86 }
85 } 87 }
86 88
87 m_quadList.append(CCRenderSurfaceDrawQuad::create(sharedQuadState.get(), sur face->contentRect(), layer, surfaceDamageRect())); 89 m_quadList.append(CCRenderSurfaceDrawQuad::create(sharedQuadState.get(), sur face->contentRect(), layer, surfaceDamageRect()));
88 m_sharedQuadStateList.append(sharedQuadState.release()); 90 m_sharedQuadStateList.append(sharedQuadState.release());
89 } 91 }
90 92
93 void CCRenderPass::appendQuadsToFillScreen(CCLayerImpl* rootLayer, const Color& screenBackgroundColor, const CCOcclusionTrackerImpl& occlusionTracker)
94 {
95 if (!rootLayer || !screenBackgroundColor.isValid())
96 return;
97
98 Region fillRegion = occlusionTracker.computeVisibleRegionInScreen();
99 if (fillRegion.isEmpty())
100 return;
101
102 OwnPtr<CCSharedQuadState> sharedQuadState = rootLayer->createSharedQuadState ();
103 TransformationMatrix transformToLayerSpace = rootLayer->screenSpaceTransform ().inverse();
104 Vector<IntRect> fillRects = fillRegion.rects();
105 for (size_t i = 0; i < fillRects.size(); ++i) {
106 IntRect layerRect = transformToLayerSpace.mapRect(fillRects[i]);
107 m_quadList.append(CCSolidColorDrawQuad::create(sharedQuadState.get(), la yerRect, screenBackgroundColor));
108 }
109 m_sharedQuadStateList.append(sharedQuadState.release());
110 }
111
91 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698