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

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

Issue 7046081: Merge 88496 - 2011-06-09 James Robinson <jamesr@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 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 | « Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h ('k') | 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) 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
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 CCLayerImpl::CCLayerImpl(LayerChromium* owner, int id) 63 CCLayerImpl::CCLayerImpl(LayerChromium* owner, int id)
64 : m_owner(owner) 64 : m_owner(owner)
65 , m_parent(0) 65 , m_parent(0)
66 , m_layerId(id) 66 , m_layerId(id)
67 , m_anchorPoint(0.5, 0.5) 67 , m_anchorPoint(0.5, 0.5)
68 , m_anchorPointZ(0) 68 , m_anchorPointZ(0)
69 , m_doubleSided(true) 69 , m_doubleSided(true)
70 , m_masksToBounds(false) 70 , m_masksToBounds(false)
71 , m_opacity(1.0) 71 , m_opacity(1.0)
72 , m_preserves3D(false) 72 , m_preserves3D(false)
73 , m_usesLayerScissor(false)
73 , m_targetRenderSurface(0) 74 , m_targetRenderSurface(0)
74 , m_drawDepth(0) 75 , m_drawDepth(0)
75 , m_drawOpacity(0) 76 , m_drawOpacity(0)
76 , m_debugBorderColor(0, 0, 0, 0) 77 , m_debugBorderColor(0, 0, 0, 0)
77 , m_debugBorderWidth(0) 78 , m_debugBorderWidth(0)
78 , m_layerRenderer(0) 79 , m_layerRenderer(0)
79 { 80 {
80 } 81 }
81 82
82 CCLayerImpl::~CCLayerImpl() 83 CCLayerImpl::~CCLayerImpl()
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 ts << "drawTransform: "; 222 ts << "drawTransform: ";
222 ts << m_drawTransform.m11() << ", " << m_drawTransform.m12() << ", " << m_dr awTransform.m13() << ", " << m_drawTransform.m14() << ", "; 223 ts << m_drawTransform.m11() << ", " << m_drawTransform.m12() << ", " << m_dr awTransform.m13() << ", " << m_drawTransform.m14() << ", ";
223 ts << m_drawTransform.m21() << ", " << m_drawTransform.m22() << ", " << m_dr awTransform.m23() << ", " << m_drawTransform.m24() << ", "; 224 ts << m_drawTransform.m21() << ", " << m_drawTransform.m22() << ", " << m_dr awTransform.m23() << ", " << m_drawTransform.m24() << ", ";
224 ts << m_drawTransform.m31() << ", " << m_drawTransform.m32() << ", " << m_dr awTransform.m33() << ", " << m_drawTransform.m34() << ", "; 225 ts << m_drawTransform.m31() << ", " << m_drawTransform.m32() << ", " << m_dr awTransform.m33() << ", " << m_drawTransform.m34() << ", ";
225 ts << m_drawTransform.m41() << ", " << m_drawTransform.m42() << ", " << m_dr awTransform.m43() << ", " << m_drawTransform.m44() << "\n"; 226 ts << m_drawTransform.m41() << ", " << m_drawTransform.m42() << ", " << m_dr awTransform.m43() << ", " << m_drawTransform.m44() << "\n";
226 } 227 }
227 228
228 } 229 }
229 230
230 #endif // USE(ACCELERATED_COMPOSITING) 231 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698