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

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

Issue 181823002: Have Document::getCSSCanvasElement() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | Source/core/dom/Document.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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer) 70 IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer)
71 { 71 {
72 if (HTMLCanvasElement* elt = element(&renderer->document())) 72 if (HTMLCanvasElement* elt = element(&renderer->document()))
73 return IntSize(elt->width(), elt->height()); 73 return IntSize(elt->width(), elt->height());
74 return IntSize(); 74 return IntSize();
75 } 75 }
76 76
77 HTMLCanvasElement* CSSCanvasValue::element(Document* document) 77 HTMLCanvasElement* CSSCanvasValue::element(Document* document)
78 { 78 {
79 if (!m_element) { 79 if (!m_element) {
80 m_element = document->getCSSCanvasElement(m_name); 80 m_element = &document->getCSSCanvasElement(m_name);
81 if (!m_element)
82 return 0;
83 m_element->addObserver(&m_canvasObserver); 81 m_element->addObserver(&m_canvasObserver);
84 } 82 }
85 return m_element; 83 return m_element;
86 } 84 }
87 85
88 PassRefPtr<Image> CSSCanvasValue::image(RenderObject* renderer, const IntSize& / *size*/) 86 PassRefPtr<Image> CSSCanvasValue::image(RenderObject* renderer, const IntSize& / *size*/)
89 { 87 {
90 ASSERT(clients().contains(renderer)); 88 ASSERT(clients().contains(renderer));
91 HTMLCanvasElement* elt = element(&renderer->document()); 89 HTMLCanvasElement* elt = element(&renderer->document());
92 if (!elt || !elt->buffer()) 90 if (!elt || !elt->buffer())
93 return nullptr; 91 return nullptr;
94 return elt->copiedImage(); 92 return elt->copiedImage();
95 } 93 }
96 94
97 bool CSSCanvasValue::equals(const CSSCanvasValue& other) const 95 bool CSSCanvasValue::equals(const CSSCanvasValue& other) const
98 { 96 {
99 return m_name == other.m_name; 97 return m_name == other.m_name;
100 } 98 }
101 99
102 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698