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

Side by Side Diff: Source/core/html/shadow/MediaControlElementTypes.cpp

Issue 598013002: Let toParentMediaElement return null for the media element itself (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | « LayoutTests/media/video-webkit-appearance-expected.html ('k') | no next file » | 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, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 using namespace HTMLNames; 44 using namespace HTMLNames;
45 45
46 class Event; 46 class Event;
47 47
48 HTMLMediaElement* toParentMediaElement(Node* node) 48 HTMLMediaElement* toParentMediaElement(Node* node)
49 { 49 {
50 if (!node) 50 if (!node)
51 return 0; 51 return 0;
52 Node* mediaNode = node->shadowHost(); 52 Node* mediaNode = node->shadowHost();
53 if (!mediaNode) 53 if (!mediaNode)
54 mediaNode = node; 54 return 0;
fs 2014/09/24 15:48:16 paintMediaSliderThumb and paintMediaVolumeSliderTh
philipj_slow 2014/09/25 07:53:10 They pass renderer->node()->shadowHost() because t
fs 2014/09/25 09:30:19 Ok, I figured it'd be something like that. LGTM.
55 if (!isHTMLMediaElement(mediaNode)) 55 if (!isHTMLMediaElement(mediaNode))
56 return 0; 56 return 0;
57 57
58 return toHTMLMediaElement(mediaNode); 58 return toHTMLMediaElement(mediaNode);
59 } 59 }
60 60
61 MediaControlElementType mediaControlElementType(Node* node) 61 MediaControlElementType mediaControlElementType(Node* node)
62 { 62 {
63 ASSERT_WITH_SECURITY_IMPLICATION(node->isMediaControlElement()); 63 ASSERT_WITH_SECURITY_IMPLICATION(node->isMediaControlElement());
64 HTMLElement* element = toHTMLElement(node); 64 HTMLElement* element = toHTMLElement(node);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 , m_currentValue(0) 144 , m_currentValue(0)
145 { 145 {
146 } 146 }
147 147
148 void MediaControlTimeDisplayElement::setCurrentValue(double time) 148 void MediaControlTimeDisplayElement::setCurrentValue(double time)
149 { 149 {
150 m_currentValue = time; 150 m_currentValue = time;
151 } 151 }
152 152
153 } // namespace blink 153 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/media/video-webkit-appearance-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698