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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp

Issue 2941533002: Break StyleImage dependency on LayoutObject (Closed)
Patch Set: Address reviewer comments Created 3 years, 6 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 FloatSize unzoomed_default_object_size(default_object_size); 52 FloatSize unzoomed_default_object_size(default_object_size);
53 unzoomed_default_object_size.Scale(1 / multiplier); 53 unzoomed_default_object_size.Scale(1 / multiplier);
54 return ApplyZoom(LayoutSize(image_generator_value_->FixedSize( 54 return ApplyZoom(LayoutSize(image_generator_value_->FixedSize(
55 document, unzoomed_default_object_size)), 55 document, unzoomed_default_object_size)),
56 multiplier); 56 multiplier);
57 } 57 }
58 58
59 return default_object_size; 59 return default_object_size;
60 } 60 }
61 61
62 void StyleGeneratedImage::AddClient(LayoutObject* layout_object) { 62 void StyleGeneratedImage::AddClient(ImageResourceObserver* observer) {
63 image_generator_value_->AddClient(layout_object, IntSize()); 63 image_generator_value_->AddClient(observer, IntSize());
64 } 64 }
65 65
66 void StyleGeneratedImage::RemoveClient(LayoutObject* layout_object) { 66 void StyleGeneratedImage::RemoveClient(ImageResourceObserver* observer) {
67 image_generator_value_->RemoveClient(layout_object); 67 image_generator_value_->RemoveClient(observer);
68 } 68 }
69 69
70 PassRefPtr<Image> StyleGeneratedImage::GetImage( 70 PassRefPtr<Image> StyleGeneratedImage::GetImage(
71 const LayoutObject& layout_object, 71 const ImageResourceObserver& observer,
72 const Document& document,
73 const ComputedStyle& style,
72 const IntSize& size) const { 74 const IntSize& size) const {
73 return image_generator_value_->GetImage(layout_object, size); 75 return image_generator_value_->GetImage(observer, document, style, size);
74 } 76 }
75 77
76 bool StyleGeneratedImage::KnownToBeOpaque(const Document& document, 78 bool StyleGeneratedImage::KnownToBeOpaque(const Document& document,
77 const ComputedStyle& style) const { 79 const ComputedStyle& style) const {
78 return image_generator_value_->KnownToBeOpaque(document, style); 80 return image_generator_value_->KnownToBeOpaque(document, style);
79 } 81 }
80 82
81 DEFINE_TRACE(StyleGeneratedImage) { 83 DEFINE_TRACE(StyleGeneratedImage) {
82 visitor->Trace(image_generator_value_); 84 visitor->Trace(image_generator_value_);
83 StyleImage::Trace(visitor); 85 StyleImage::Trace(visitor);
84 } 86 }
85 87
86 } // namespace blink 88 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.h ('k') | third_party/WebKit/Source/core/style/StyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698