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

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMeterElement.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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 584
585 if (Traversal<HTMLTrackElement>::firstChild(*this)) 585 if (Traversal<HTMLTrackElement>::firstChild(*this))
586 scheduleDelayedAction(LoadTextTrackResource); 586 scheduleDelayedAction(LoadTextTrackResource);
587 } 587 }
588 588
589 bool HTMLMediaElement::rendererIsNeeded(const RenderStyle& style) 589 bool HTMLMediaElement::rendererIsNeeded(const RenderStyle& style)
590 { 590 {
591 return shouldShowControls() && HTMLElement::rendererIsNeeded(style); 591 return shouldShowControls() && HTMLElement::rendererIsNeeded(style);
592 } 592 }
593 593
594 RenderObject* HTMLMediaElement::createRenderer(const RenderStyle&) 594 LayoutObject* HTMLMediaElement::createRenderer(const RenderStyle&)
595 { 595 {
596 return new RenderMedia(this); 596 return new RenderMedia(this);
597 } 597 }
598 598
599 Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint) 599 Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint)
600 { 600 {
601 WTF_LOG(Media, "HTMLMediaElement::insertedInto(%p, %p)", this, insertionPoin t); 601 WTF_LOG(Media, "HTMLMediaElement::insertedInto(%p, %p)", this, insertionPoin t);
602 602
603 HTMLElement::insertedInto(insertionPoint); 603 HTMLElement::insertedInto(insertionPoint);
604 if (insertionPoint->inDocument()) { 604 if (insertionPoint->inDocument()) {
(...skipping 3506 matching lines...) Expand 10 before | Expand all | Expand 10 after
4111 4111
4112 #if ENABLE(WEB_AUDIO) 4112 #if ENABLE(WEB_AUDIO)
4113 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 4113 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
4114 { 4114 {
4115 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 4115 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
4116 audioSourceProvider()->setClient(nullptr); 4116 audioSourceProvider()->setClient(nullptr);
4117 } 4117 }
4118 #endif 4118 #endif
4119 4119
4120 } 4120 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMeterElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698