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

Side by Side Diff: sky/engine/core/css/resolver/StyleResourceLoader.cpp

Issue 1069403003: Remove CSS list-style (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 8 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2013 Google Inc. All rights reserved. 4 * Copyright (C) 2013 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 CSSPropertyID currentProperty = *it; 68 CSSPropertyID currentProperty = *it;
69 69
70 switch (currentProperty) { 70 switch (currentProperty) {
71 case CSSPropertyBackgroundImage: { 71 case CSSPropertyBackgroundImage: {
72 for (FillLayer* backgroundLayer = &style->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) { 72 for (FillLayer* backgroundLayer = &style->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
73 if (backgroundLayer->image() && backgroundLayer->image()->isPend ingImage()) 73 if (backgroundLayer->image() && backgroundLayer->image()->isPend ingImage())
74 backgroundLayer->setImage(loadPendingImage(toStylePendingIma ge(backgroundLayer->image()), elementStyleResources.deviceScaleFactor())); 74 backgroundLayer->setImage(loadPendingImage(toStylePendingIma ge(backgroundLayer->image()), elementStyleResources.deviceScaleFactor()));
75 } 75 }
76 break; 76 break;
77 } 77 }
78 case CSSPropertyListStyleImage: {
79 if (style->listStyleImage() && style->listStyleImage()->isPendingIma ge())
80 style->setListStyleImage(loadPendingImage(toStylePendingImage(st yle->listStyleImage()), elementStyleResources.deviceScaleFactor()));
81 break;
82 }
83 case CSSPropertyBorderImageSource: { 78 case CSSPropertyBorderImageSource: {
84 if (style->borderImageSource() && style->borderImageSource()->isPend ingImage()) 79 if (style->borderImageSource() && style->borderImageSource()->isPend ingImage())
85 style->setBorderImageSource(loadPendingImage(toStylePendingImage (style->borderImageSource()), elementStyleResources.deviceScaleFactor())); 80 style->setBorderImageSource(loadPendingImage(toStylePendingImage (style->borderImageSource()), elementStyleResources.deviceScaleFactor()));
86 break; 81 break;
87 } 82 }
88 default: 83 default:
89 ASSERT_NOT_REACHED(); 84 ASSERT_NOT_REACHED();
90 } 85 }
91 } 86 }
92 87
93 elementStyleResources.clearPendingImageProperties(); 88 elementStyleResources.clearPendingImageProperties();
94 } 89 }
95 90
96 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element StyleResources& elementStyleResources) 91 void StyleResourceLoader::loadPendingResources(RenderStyle* renderStyle, Element StyleResources& elementStyleResources)
97 { 92 {
98 // Start loading images referenced by this style. 93 // Start loading images referenced by this style.
99 loadPendingImages(renderStyle, elementStyleResources); 94 loadPendingImages(renderStyle, elementStyleResources);
100 } 95 }
101 96
102 } 97 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleBuilderCustom.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698