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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 204373003: Oilpan: Change references to MutableStylePropertySet to transition types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 792
793 loadPendingResources(state); 793 loadPendingResources(state);
794 794
795 didAccess(); 795 didAccess();
796 796
797 return state.takeStyle(); 797 return state.takeStyle();
798 } 798 }
799 799
800 // This function is used by the WebAnimations JavaScript API method animate(). 800 // This function is used by the WebAnimations JavaScript API method animate().
801 // FIXME: Remove this when animate() switches away from resolution-dependent par sing. 801 // FIXME: Remove this when animate() switches away from resolution-dependent par sing.
802 PassRefPtrWillBeRawPtr<KeyframeEffectModel> StyleResolver::createKeyframeEffectM odel(Element& element, const Vector<RefPtr<MutableStylePropertySet> >& propertyS etVector, KeyframeEffectModel::KeyframeVector& keyframes) 802 PassRefPtrWillBeRawPtr<KeyframeEffectModel> StyleResolver::createKeyframeEffectM odel(Element& element, const WillBeHeapVector<RefPtrWillBeMember<MutableStylePro pertySet> >& propertySetVector, KeyframeEffectModel::KeyframeVector& keyframes)
803 { 803 {
804 ASSERT(propertySetVector.size() == keyframes.size()); 804 ASSERT(propertySetVector.size() == keyframes.size());
805 805
806 StyleResolverState state(element.document(), &element); 806 StyleResolverState state(element.document(), &element);
807 state.setStyle(RenderStyle::create()); 807 state.setStyle(RenderStyle::create());
808 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules()); 808 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules());
809 809
810 for (unsigned i = 0; i < propertySetVector.size(); ++i) { 810 for (unsigned i = 0; i < propertySetVector.size(); ++i) {
811 for (unsigned j = 0; j < propertySetVector[i]->propertyCount(); ++j) { 811 for (unsigned j = 0; j < propertySetVector[i]->propertyCount(); ++j) {
812 CSSPropertyID id = propertySetVector[i]->propertyAt(j).id(); 812 CSSPropertyID id = propertySetVector[i]->propertyAt(j).id();
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 bool StyleResolver::mediaQueryAffectedByViewportChange() const 1413 bool StyleResolver::mediaQueryAffectedByViewportChange() const
1414 { 1414 {
1415 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1415 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1416 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1416 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1417 return true; 1417 return true;
1418 } 1418 }
1419 return false; 1419 return false;
1420 } 1420 }
1421 1421
1422 } // namespace WebCore 1422 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698