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

Side by Side Diff: Source/core/style/StyleFetchedImage.cpp

Issue 1314793010: Support fragment URLs for all kinds of SVG images (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update DEPS to match 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 13 matching lines...) Expand all
24 #include "config.h" 24 #include "config.h"
25 #include "core/style/StyleFetchedImage.h" 25 #include "core/style/StyleFetchedImage.h"
26 26
27 #include "core/css/CSSImageValue.h" 27 #include "core/css/CSSImageValue.h"
28 #include "core/fetch/ImageResource.h" 28 #include "core/fetch/ImageResource.h"
29 #include "core/layout/LayoutObject.h" 29 #include "core/layout/LayoutObject.h"
30 #include "core/svg/graphics/SVGImage.h" 30 #include "core/svg/graphics/SVGImage.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 StyleFetchedImage::StyleFetchedImage(ImageResource* image, Document* document) 34 StyleFetchedImage::StyleFetchedImage(ImageResource* image, Document* document, c onst KURL& urlWithFragment)
35 : m_image(image) 35 : m_image(image)
36 , m_document(document) 36 , m_document(document)
37 , m_urlWithFragment(urlWithFragment)
37 { 38 {
38 m_isImageResource = true; 39 m_isImageResource = true;
39 m_image->addClient(this); 40 m_image->addClient(this);
40 } 41 }
41 42
42 StyleFetchedImage::~StyleFetchedImage() 43 StyleFetchedImage::~StyleFetchedImage()
43 { 44 {
44 m_image->removeClient(this); 45 m_image->removeClient(this);
45 } 46 }
46 47
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrins icRatio); 85 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrins icRatio);
85 } 86 }
86 87
87 bool StyleFetchedImage::usesImageContainerSize() const 88 bool StyleFetchedImage::usesImageContainerSize() const
88 { 89 {
89 return m_image->usesImageContainerSize(); 90 return m_image->usesImageContainerSize();
90 } 91 }
91 92
92 void StyleFetchedImage::setContainerSizeForLayoutObject(const LayoutObject* layo utObject, const IntSize& imageContainerSize, float imageContainerZoomFactor) 93 void StyleFetchedImage::setContainerSizeForLayoutObject(const LayoutObject* layo utObject, const IntSize& imageContainerSize, float imageContainerZoomFactor)
93 { 94 {
94 m_image->setContainerSizeForLayoutObject(layoutObject, imageContainerSize, i mageContainerZoomFactor); 95 m_image->setContainerParametersForLayoutObject(layoutObject, imageContainerS ize, imageContainerZoomFactor, m_urlWithFragment);
95 } 96 }
96 97
97 void StyleFetchedImage::addClient(LayoutObject* layoutObject) 98 void StyleFetchedImage::addClient(LayoutObject* layoutObject)
98 { 99 {
99 m_image->addClient(layoutObject); 100 m_image->addClient(layoutObject);
100 } 101 }
101 102
102 void StyleFetchedImage::removeClient(LayoutObject* layoutObject) 103 void StyleFetchedImage::removeClient(LayoutObject* layoutObject)
103 { 104 {
104 m_image->removeClient(layoutObject); 105 m_image->removeClient(layoutObject);
(...skipping 17 matching lines...) Expand all
122 return m_image->currentFrameKnownToBeOpaque(layoutObject); 123 return m_image->currentFrameKnownToBeOpaque(layoutObject);
123 } 124 }
124 125
125 DEFINE_TRACE(StyleFetchedImage) 126 DEFINE_TRACE(StyleFetchedImage)
126 { 127 {
127 visitor->trace(m_document); 128 visitor->trace(m_document);
128 StyleImage::trace(visitor); 129 StyleImage::trace(visitor);
129 } 130 }
130 131
131 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698