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

Side by Side Diff: Source/core/css/CSSImageGeneratorValue.cpp

Issue 1306283006: BackgroundImage incorrectly returns empty url() when created on-the-fly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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/core/css/CSSImageGeneratorValue.h ('k') | Source/core/css/CSSImageSetValue.h » ('j') | 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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject); 60 LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject);
61 if (it == m_clients.end()) { 61 if (it == m_clients.end()) {
62 m_clients.add(layoutObject, SizeAndCount(size, 1)); 62 m_clients.add(layoutObject, SizeAndCount(size, 1));
63 } else { 63 } else {
64 SizeAndCount& sizeCount = it->value; 64 SizeAndCount& sizeCount = it->value;
65 ++sizeCount.count; 65 ++sizeCount.count;
66 } 66 }
67 } 67 }
68 68
69 PassRefPtrWillBeRawPtr<CSSImageGeneratorValue> CSSImageGeneratorValue::valueWith URLsMadeAbsolute()
70 {
71 if (isCrossfadeValue())
72 return toCSSCrossfadeValue(this)->valueWithURLsMadeAbsolute();
73 return this;
74 }
75
69 void CSSImageGeneratorValue::removeClient(LayoutObject* layoutObject) 76 void CSSImageGeneratorValue::removeClient(LayoutObject* layoutObject)
70 { 77 {
71 ASSERT(layoutObject); 78 ASSERT(layoutObject);
72 LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject); 79 LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject);
73 ASSERT_WITH_SECURITY_IMPLICATION(it != m_clients.end()); 80 ASSERT_WITH_SECURITY_IMPLICATION(it != m_clients.end());
74 81
75 IntSize removedImageSize; 82 IntSize removedImageSize;
76 SizeAndCount& sizeCount = it->value; 83 SizeAndCount& sizeCount = it->value;
77 IntSize size = sizeCount.size; 84 IntSize size = sizeCount.size;
78 if (!size.isEmpty()) { 85 if (!size.isEmpty()) {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 break; 226 break;
220 case RadialGradientClass: 227 case RadialGradientClass:
221 toCSSRadialGradientValue(this)->loadSubimages(document); 228 toCSSRadialGradientValue(this)->loadSubimages(document);
222 break; 229 break;
223 default: 230 default:
224 ASSERT_NOT_REACHED(); 231 ASSERT_NOT_REACHED();
225 } 232 }
226 } 233 }
227 234
228 } // namespace blink 235 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSImageGeneratorValue.h ('k') | Source/core/css/CSSImageSetValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698