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

Side by Side Diff: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp

Issue 1158603003: CSS Independent Transform Properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master and explicit applyTransform parameters Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 { 262 {
263 m_graphicsLayer->setOpacity(compositingOpacity(style.opacity())); 263 m_graphicsLayer->setOpacity(compositingOpacity(style.opacity()));
264 } 264 }
265 265
266 void CompositedDeprecatedPaintLayerMapping::updateTransform(const ComputedStyle& style) 266 void CompositedDeprecatedPaintLayerMapping::updateTransform(const ComputedStyle& style)
267 { 267 {
268 // FIXME: This could use m_owningLayer.transform(), but that currently has t ransform-origin 268 // FIXME: This could use m_owningLayer.transform(), but that currently has t ransform-origin
269 // baked into it, and we don't want that. 269 // baked into it, and we don't want that.
270 TransformationMatrix t; 270 TransformationMatrix t;
271 if (m_owningLayer.hasTransformRelatedProperty()) { 271 if (m_owningLayer.hasTransformRelatedProperty()) {
272 style.applyTransform(t, LayoutSize(toLayoutBox(layoutObject())->pixelSna ppedSize()), ComputedStyle::ExcludeTransformOrigin); 272 style.applyTransform(t, LayoutSize(toLayoutBox(layoutObject())->pixelSna ppedSize()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::IncludeMotion Path, ComputedStyle::IncludeIndependentTransformProperties);
alancutter (OOO until 2018) 2015/06/18 13:03:24 Looks like you'll need to rebase again on the chan
soonm 2015/06/19 04:39:52 Done.
273 makeMatrixRenderable(t, compositor()->hasAcceleratedCompositing()); 273 makeMatrixRenderable(t, compositor()->hasAcceleratedCompositing());
274 } 274 }
275 275
276 m_graphicsLayer->setTransform(t); 276 m_graphicsLayer->setTransform(t);
277 } 277 }
278 278
279 void CompositedDeprecatedPaintLayerMapping::updateFilters(const ComputedStyle& s tyle) 279 void CompositedDeprecatedPaintLayerMapping::updateFilters(const ComputedStyle& s tyle)
280 { 280 {
281 m_graphicsLayer->setFilters(owningLayer().computeFilterOperations(style)); 281 m_graphicsLayer->setFilters(owningLayer().computeFilterOperations(style));
282 } 282 }
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2342 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2343 name = "Scrolling Block Selection Layer"; 2343 name = "Scrolling Block Selection Layer";
2344 } else { 2344 } else {
2345 ASSERT_NOT_REACHED(); 2345 ASSERT_NOT_REACHED();
2346 } 2346 }
2347 2347
2348 return name; 2348 return name;
2349 } 2349 }
2350 2350
2351 } // namespace blink 2351 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698