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

Side by Side Diff: Source/WebCore/platform/graphics/filters/FEComposite.cpp

Issue 6949013: Merge 85926 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 switch (m_type) { 180 switch (m_type) {
181 case FECOMPOSITE_OPERATOR_IN: 181 case FECOMPOSITE_OPERATOR_IN:
182 case FECOMPOSITE_OPERATOR_ATOP: 182 case FECOMPOSITE_OPERATOR_ATOP:
183 // For In and Atop the first effect just influences the result of 183 // For In and Atop the first effect just influences the result of
184 // the second effect. So just use the absolute paint rect of the second effect here. 184 // the second effect. So just use the absolute paint rect of the second effect here.
185 setAbsolutePaintRect(inputEffect(1)->absolutePaintRect()); 185 setAbsolutePaintRect(inputEffect(1)->absolutePaintRect());
186 return; 186 return;
187 case FECOMPOSITE_OPERATOR_ARITHMETIC: 187 case FECOMPOSITE_OPERATOR_ARITHMETIC:
188 // Arithmetic may influnce the compele filter primitive region. So we ca n't 188 // Arithmetic may influnce the compele filter primitive region. So we ca n't
189 // optimize the paint region here. 189 // optimize the paint region here.
190 setAbsolutePaintRect(maxEffectRect()); 190 setAbsolutePaintRect(enclosingIntRect(maxEffectRect()));
191 return; 191 return;
192 default: 192 default:
193 // Take the union of both input effects. 193 // Take the union of both input effects.
194 FilterEffect::determineAbsolutePaintRect(); 194 FilterEffect::determineAbsolutePaintRect();
195 return; 195 return;
196 } 196 }
197 } 197 }
198 198
199 void FEComposite::apply() 199 void FEComposite::apply()
200 { 200 {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 ts << " k1=\"" << m_k1 << "\" k2=\"" << m_k2 << "\" k3=\"" << m_k3 << "\ " k4=\"" << m_k4 << "\""; 298 ts << " k1=\"" << m_k1 << "\" k2=\"" << m_k2 << "\" k3=\"" << m_k3 << "\ " k4=\"" << m_k4 << "\"";
299 ts << "]\n"; 299 ts << "]\n";
300 inputEffect(0)->externalRepresentation(ts, indent + 1); 300 inputEffect(0)->externalRepresentation(ts, indent + 1);
301 inputEffect(1)->externalRepresentation(ts, indent + 1); 301 inputEffect(1)->externalRepresentation(ts, indent + 1);
302 return ts; 302 return ts;
303 } 303 }
304 304
305 } // namespace WebCore 305 } // namespace WebCore
306 306
307 #endif // ENABLE(FILTERS) 307 #endif // ENABLE(FILTERS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698