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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 } 559 }
560 560
561 void HTMLMediaElement::finishParsingChildren() 561 void HTMLMediaElement::finishParsingChildren()
562 { 562 {
563 HTMLElement::finishParsingChildren(); 563 HTMLElement::finishParsingChildren();
564 564
565 if (Traversal<HTMLTrackElement>::firstChild(*this)) 565 if (Traversal<HTMLTrackElement>::firstChild(*this))
566 scheduleDelayedAction(LoadTextTrackResource); 566 scheduleDelayedAction(LoadTextTrackResource);
567 } 567 }
568 568
569 bool HTMLMediaElement::layoutObjectIsNeeded(const LayoutStyle& style) 569 bool HTMLMediaElement::layoutObjectIsNeeded(const ComputedStyle& style)
570 { 570 {
571 return shouldShowControls() && HTMLElement::layoutObjectIsNeeded(style); 571 return shouldShowControls() && HTMLElement::layoutObjectIsNeeded(style);
572 } 572 }
573 573
574 LayoutObject* HTMLMediaElement::createLayoutObject(const LayoutStyle&) 574 LayoutObject* HTMLMediaElement::createLayoutObject(const ComputedStyle&)
575 { 575 {
576 return new LayoutMedia(this); 576 return new LayoutMedia(this);
577 } 577 }
578 578
579 Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint) 579 Node::InsertionNotificationRequest HTMLMediaElement::insertedInto(ContainerNode* insertionPoint)
580 { 580 {
581 WTF_LOG(Media, "HTMLMediaElement::insertedInto(%p, %p)", this, insertionPoin t); 581 WTF_LOG(Media, "HTMLMediaElement::insertedInto(%p, %p)", this, insertionPoin t);
582 582
583 HTMLElement::insertedInto(insertionPoint); 583 HTMLElement::insertedInto(insertionPoint);
584 if (insertionPoint->inDocument()) { 584 if (insertionPoint->inDocument()) {
(...skipping 3080 matching lines...) Expand 10 before | Expand all | Expand 10 after
3665 3665
3666 #if ENABLE(WEB_AUDIO) 3666 #if ENABLE(WEB_AUDIO)
3667 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 3667 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
3668 { 3668 {
3669 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 3669 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
3670 audioSourceProvider()->setClient(nullptr); 3670 audioSourceProvider()->setClient(nullptr);
3671 } 3671 }
3672 #endif 3672 #endif
3673 3673
3674 } 3674 }
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