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

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

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSGridTemplateAreasValue.h ('k') | Source/core/css/CSSImageValue.cpp » ('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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 16 matching lines...) Expand all
27 #include "core/css/CSSImageSetValue.h" 27 #include "core/css/CSSImageSetValue.h"
28 28
29 #include "core/css/CSSImageValue.h" 29 #include "core/css/CSSImageValue.h"
30 #include "core/css/CSSPrimitiveValue.h" 30 #include "core/css/CSSPrimitiveValue.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/fetch/FetchInitiatorTypeNames.h" 32 #include "core/fetch/FetchInitiatorTypeNames.h"
33 #include "core/fetch/FetchRequest.h" 33 #include "core/fetch/FetchRequest.h"
34 #include "core/fetch/ImageResource.h" 34 #include "core/fetch/ImageResource.h"
35 #include "core/fetch/ResourceFetcher.h" 35 #include "core/fetch/ResourceFetcher.h"
36 #include "core/fetch/ResourceLoaderOptions.h" 36 #include "core/fetch/ResourceLoaderOptions.h"
37 #include "core/layout/style/StyleFetchedImageSet.h" 37 #include "core/style/StyleFetchedImageSet.h"
38 #include "core/layout/style/StylePendingImage.h" 38 #include "core/style/StylePendingImage.h"
39 #include "platform/weborigin/KURL.h" 39 #include "platform/weborigin/KURL.h"
40 #include "platform/weborigin/SecurityPolicy.h" 40 #include "platform/weborigin/SecurityPolicy.h"
41 #include "wtf/text/StringBuilder.h" 41 #include "wtf/text/StringBuilder.h"
42 42
43 namespace blink { 43 namespace blink {
44 44
45 CSSImageSetValue::CSSImageSetValue() 45 CSSImageSetValue::CSSImageSetValue()
46 : CSSValueList(ImageSetClass, CommaSeparator) 46 : CSSValueList(ImageSetClass, CommaSeparator)
47 , m_accessedBestFitImage(false) 47 , m_accessedBestFitImage(false)
48 , m_scaleFactor(1) 48 , m_scaleFactor(1)
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const 174 bool CSSImageSetValue::hasFailedOrCanceledSubresources() const
175 { 175 {
176 if (!m_imageSet || !m_imageSet->isImageResourceSet()) 176 if (!m_imageSet || !m_imageSet->isImageResourceSet())
177 return false; 177 return false;
178 if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedIma ge()) 178 if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedIma ge())
179 return cachedResource->loadFailedOrCanceled(); 179 return cachedResource->loadFailedOrCanceled();
180 return true; 180 return true;
181 } 181 }
182 182
183 } // namespace blink 183 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSGridTemplateAreasValue.h ('k') | Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698