| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "CCDrawQuad.h" | 7 #include "CCDrawQuad.h" |
| 8 | 8 |
| 9 #include "CCCheckerboardDrawQuad.h" | 9 #include "CCCheckerboardDrawQuad.h" |
| 10 #include "CCDebugBorderDrawQuad.h" | 10 #include "CCDebugBorderDrawQuad.h" |
| 11 #include "CCIOSurfaceDrawQuad.h" | 11 #include "CCIOSurfaceDrawQuad.h" |
| 12 #include "CCRenderPassDrawQuad.h" | 12 #include "CCRenderPassDrawQuad.h" |
| 13 #include "CCTileDrawQuad.h" | 13 #include "CCTileDrawQuad.h" |
| 14 #include "CCYUVVideoDrawQuad.h" | 14 #include "CCYUVVideoDrawQuad.h" |
| 15 #include "IntRect.h" | |
| 16 #include "base/logging.h" | 15 #include "base/logging.h" |
| 17 #include "cc/solid_color_draw_quad.h" | 16 #include "cc/solid_color_draw_quad.h" |
| 18 #include "cc/stream_video_draw_quad.h" | 17 #include "cc/stream_video_draw_quad.h" |
| 19 #include "cc/texture_draw_quad.h" | 18 #include "cc/texture_draw_quad.h" |
| 20 | 19 |
| 21 namespace cc { | 20 namespace cc { |
| 22 | 21 |
| 23 CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material materi
al, const IntRect& quadRect) | 22 CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material materi
al, const gfx::Rect& quadRect) |
| 24 : m_sharedQuadState(sharedQuadState) | 23 : m_sharedQuadState(sharedQuadState) |
| 25 , m_sharedQuadStateId(sharedQuadState->id) | 24 , m_sharedQuadStateId(sharedQuadState->id) |
| 26 , m_material(material) | 25 , m_material(material) |
| 27 , m_quadRect(quadRect) | 26 , m_quadRect(quadRect) |
| 28 , m_quadVisibleRect(quadRect) | 27 , m_quadVisibleRect(quadRect) |
| 29 , m_quadOpaque(true) | 28 , m_quadOpaque(true) |
| 30 , m_needsBlending(false) | 29 , m_needsBlending(false) |
| 31 { | 30 { |
| 32 DCHECK(m_sharedQuadState); | 31 DCHECK(m_sharedQuadState); |
| 33 DCHECK(m_material != Invalid); | 32 DCHECK(m_material != Invalid); |
| 34 } | 33 } |
| 35 | 34 |
| 36 IntRect CCDrawQuad::opaqueRect() const | 35 gfx::Rect CCDrawQuad::opaqueRect() const |
| 37 { | 36 { |
| 38 if (opacity() != 1) | 37 if (opacity() != 1) |
| 39 return IntRect(); | 38 return gfx::Rect(); |
| 40 if (m_sharedQuadState->opaque && m_quadOpaque) | 39 if (m_sharedQuadState->opaque && m_quadOpaque) |
| 41 return m_quadRect; | 40 return m_quadRect; |
| 42 return m_opaqueRect; | 41 return m_opaqueRect; |
| 43 } | 42 } |
| 44 | 43 |
| 45 void CCDrawQuad::setQuadVisibleRect(const IntRect& quadVisibleRect) | 44 void CCDrawQuad::setQuadVisibleRect(gfx::Rect quadVisibleRect) |
| 46 { | 45 { |
| 47 IntRect intersection = quadVisibleRect; | 46 m_quadVisibleRect = quadVisibleRect.Intersect(m_quadRect); |
| 48 intersection.intersect(m_quadRect); | |
| 49 m_quadVisibleRect = intersection; | |
| 50 } | 47 } |
| 51 | 48 |
| 52 unsigned CCDrawQuad::size() const | 49 unsigned CCDrawQuad::size() const |
| 53 { | 50 { |
| 54 switch (material()) { | 51 switch (material()) { |
| 55 case Checkerboard: | 52 case Checkerboard: |
| 56 return sizeof(CCCheckerboardDrawQuad); | 53 return sizeof(CCCheckerboardDrawQuad); |
| 57 case DebugBorder: | 54 case DebugBorder: |
| 58 return sizeof(CCDebugBorderDrawQuad); | 55 return sizeof(CCDebugBorderDrawQuad); |
| 59 case IOSurfaceContent: | 56 case IOSurfaceContent: |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 return copyQuad.Pass(); | 90 return copyQuad.Pass(); |
| 94 } | 91 } |
| 95 | 92 |
| 96 void CCDrawQuad::setSharedQuadState(const CCSharedQuadState* sharedQuadState) | 93 void CCDrawQuad::setSharedQuadState(const CCSharedQuadState* sharedQuadState) |
| 97 { | 94 { |
| 98 m_sharedQuadState = sharedQuadState; | 95 m_sharedQuadState = sharedQuadState; |
| 99 m_sharedQuadStateId = sharedQuadState->id; | 96 m_sharedQuadStateId = sharedQuadState->id; |
| 100 } | 97 } |
| 101 | 98 |
| 102 } | 99 } |
| OLD | NEW |