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

Side by Side Diff: Source/core/style/StyleGeneratedImage.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/style/StyleGeneratedImage.h ('k') | Source/core/style/StyleImage.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) 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 24 matching lines...) Expand all
35 , m_fixedSize(m_imageGeneratorValue->isFixedSize()) 35 , m_fixedSize(m_imageGeneratorValue->isFixedSize())
36 { 36 {
37 m_isGeneratedImage = true; 37 m_isGeneratedImage = true;
38 } 38 }
39 39
40 PassRefPtrWillBeRawPtr<CSSValue> StyleGeneratedImage::cssValue() const 40 PassRefPtrWillBeRawPtr<CSSValue> StyleGeneratedImage::cssValue() const
41 { 41 {
42 return m_imageGeneratorValue.get(); 42 return m_imageGeneratorValue.get();
43 } 43 }
44 44
45 PassRefPtrWillBeRawPtr<CSSValue> StyleGeneratedImage::computedCSSValue() const
46 {
47 return m_imageGeneratorValue->valueWithURLsMadeAbsolute();
48 }
49
45 LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa t multiplier) const 50 LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa t multiplier) const
46 { 51 {
47 if (m_fixedSize) { 52 if (m_fixedSize) {
48 LayoutSize fixedSize(m_imageGeneratorValue->fixedSize(layoutObject)); 53 LayoutSize fixedSize(m_imageGeneratorValue->fixedSize(layoutObject));
49 if (multiplier == 1.0f) 54 if (multiplier == 1.0f)
50 return fixedSize; 55 return fixedSize;
51 56
52 LayoutUnit width = fixedSize.width() * multiplier; 57 LayoutUnit width = fixedSize.width() * multiplier;
53 LayoutUnit height = fixedSize.height() * multiplier; 58 LayoutUnit height = fixedSize.height() * multiplier;
54 59
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return m_imageGeneratorValue->knownToBeOpaque(layoutObject); 99 return m_imageGeneratorValue->knownToBeOpaque(layoutObject);
95 } 100 }
96 101
97 DEFINE_TRACE(StyleGeneratedImage) 102 DEFINE_TRACE(StyleGeneratedImage)
98 { 103 {
99 visitor->trace(m_imageGeneratorValue); 104 visitor->trace(m_imageGeneratorValue);
100 StyleImage::trace(visitor); 105 StyleImage::trace(visitor);
101 } 106 }
102 107
103 } 108 }
OLDNEW
« no previous file with comments | « Source/core/style/StyleGeneratedImage.h ('k') | Source/core/style/StyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698