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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

Issue 2164493002: Renamed Node::attach to Node::attachLayoutTree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style) 76 bool HTMLVideoElement::layoutObjectIsNeeded(const ComputedStyle& style)
77 { 77 {
78 return HTMLElement::layoutObjectIsNeeded(style); 78 return HTMLElement::layoutObjectIsNeeded(style);
79 } 79 }
80 80
81 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&) 81 LayoutObject* HTMLVideoElement::createLayoutObject(const ComputedStyle&)
82 { 82 {
83 return new LayoutVideo(this); 83 return new LayoutVideo(this);
84 } 84 }
85 85
86 void HTMLVideoElement::attach(const AttachContext& context) 86 void HTMLVideoElement::attachLayoutTree(const AttachContext& context)
87 { 87 {
88 HTMLMediaElement::attach(context); 88 HTMLMediaElement::attachLayoutTree(context);
89 89
90 updateDisplayState(); 90 updateDisplayState();
91 if (shouldDisplayPosterImage()) { 91 if (shouldDisplayPosterImage()) {
92 if (!m_imageLoader) 92 if (!m_imageLoader)
93 m_imageLoader = HTMLImageLoader::create(this); 93 m_imageLoader = HTMLImageLoader::create(this);
94 m_imageLoader->updateFromElement(); 94 m_imageLoader->updateFromElement();
95 if (layoutObject()) 95 if (layoutObject())
96 toLayoutImage(layoutObject())->imageResource()->setImageResource(m_i mageLoader->image()); 96 toLayoutImage(layoutObject())->imageResource()->setImageResource(m_i mageLoader->image());
97 } 97 }
98 } 98 }
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 } 340 }
341 if ((cropRect && !ImageBitmap::isSourceSizeValid(cropRect->width(), cropRect ->height(), exceptionState)) 341 if ((cropRect && !ImageBitmap::isSourceSizeValid(cropRect->width(), cropRect ->height(), exceptionState))
342 || !ImageBitmap::isSourceSizeValid(bitmapSourceSize().width(), bitmapSou rceSize().height(), exceptionState)) 342 || !ImageBitmap::isSourceSizeValid(bitmapSourceSize().width(), bitmapSou rceSize().height(), exceptionState))
343 return ScriptPromise(); 343 return ScriptPromise();
344 if (!ImageBitmap::isResizeOptionValid(options, exceptionState)) 344 if (!ImageBitmap::isResizeOptionValid(options, exceptionState))
345 return ScriptPromise(); 345 return ScriptPromise();
346 return ImageBitmapSource::fulfillImageBitmap(scriptState, ImageBitmap::creat e(this, cropRect, eventTarget.toLocalDOMWindow()->document(), options)); 346 return ImageBitmapSource::fulfillImageBitmap(scriptState, ImageBitmap::creat e(this, cropRect, eventTarget.toLocalDOMWindow()->document(), options));
347 } 347 }
348 348
349 } // namespace blink 349 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698