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

Unified Diff: sky/engine/core/css/CSSImageValue.cpp

Issue 1214633005: Remove CSS clients of ImageResource (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSImageValue.h ('k') | sky/engine/core/css/CSSValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSImageValue.cpp
diff --git a/sky/engine/core/css/CSSImageValue.cpp b/sky/engine/core/css/CSSImageValue.cpp
deleted file mode 100644
index b7b17b4b61caffbc721620c3759df32e2e648fd7..0000000000000000000000000000000000000000
--- a/sky/engine/core/css/CSSImageValue.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "sky/engine/core/css/CSSImageValue.h"
-
-#include "gen/sky/core/FetchInitiatorTypeNames.h"
-#include "sky/engine/core/css/CSSMarkup.h"
-#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/fetch/FetchRequest.h"
-#include "sky/engine/core/fetch/ImageResource.h"
-#include "sky/engine/core/rendering/style/StyleFetchedImage.h"
-#include "sky/engine/core/rendering/style/StylePendingImage.h"
-#include "sky/engine/platform/weborigin/KURL.h"
-
-namespace blink {
-
-CSSImageValue::CSSImageValue(const String& rawValue, const KURL& url, StyleImage* image)
- : CSSValue(ImageClass)
- , m_relativeURL(rawValue)
- , m_absoluteURL(url.string())
- , m_image(image)
- , m_accessedImage(image)
-{
-}
-
-CSSImageValue::~CSSImageValue()
-{
-}
-
-StyleImage* CSSImageValue::cachedOrPendingImage()
-{
- if (!m_image)
- m_image = StylePendingImage::create(this);
-
- return m_image.get();
-}
-
-StyleFetchedImage* CSSImageValue::cachedImage(ResourceFetcher* fetcher, const ResourceLoaderOptions& options)
-{
- ASSERT(fetcher);
-
- if (!m_accessedImage) {
- m_accessedImage = true;
-
- FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
- request.mutableResourceRequest().setHTTPReferrer(m_referrer);
-
- if (ResourcePtr<ImageResource> cachedImage = fetcher->fetchImage(request))
- m_image = StyleFetchedImage::create(cachedImage.get());
- }
-
- return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image) : 0;
-}
-
-void CSSImageValue::restoreCachedResourceIfNeeded(Document& document)
-{
- if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher())
- return;
- if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)))
- return;
-
- ImageResource* resource = m_image->cachedImage();
- if (!resource)
- return;
-
- FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());
- document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::ResourceLoadingFromCache);
-}
-
-bool CSSImageValue::equals(const CSSImageValue& other) const
-{
- return m_absoluteURL == other.m_absoluteURL;
-}
-
-String CSSImageValue::customCSSText() const
-{
- return "url(" + quoteCSSURLIfNeeded(m_absoluteURL) + ")";
-}
-
-PassRefPtr<CSSValue> CSSImageValue::cloneForCSSOM() const
-{
- // NOTE: We expose CSSImageValues as URI primitive values in CSSOM to maintain old behavior.
- RefPtr<CSSPrimitiveValue> uriValue = CSSPrimitiveValue::create(m_absoluteURL, CSSPrimitiveValue::CSS_URI);
- uriValue->setCSSOMSafe();
- return uriValue.release();
-}
-
-bool CSSImageValue::knownToBeOpaque(const RenderObject* renderer) const
-{
- return m_image ? m_image->knownToBeOpaque(renderer) : false;
-}
-
-void CSSImageValue::reResolveURL(const Document& document)
-{
- KURL url = document.completeURL(m_relativeURL);
- if (url == m_absoluteURL)
- return;
- m_absoluteURL = url.string();
- m_accessedImage = false;
- m_image.clear();
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/css/CSSImageValue.h ('k') | sky/engine/core/css/CSSValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698