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

Side by Side Diff: Source/core/html/shadow/MediaControlElements.h

Issue 839293002: Revert of Re-enable the activation behavior of media elements (click to play/pause) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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.cpp ('k') | Source/core/html/shadow/MediaControlElements.cpp » ('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, 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 class MediaControlOverlayPlayButtonElement final : public MediaControlInputEleme nt { 122 class MediaControlOverlayPlayButtonElement final : public MediaControlInputEleme nt {
123 public: 123 public:
124 static PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> create(M ediaControls&); 124 static PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> create(M ediaControls&);
125 125
126 virtual void updateDisplayType() override; 126 virtual void updateDisplayType() override;
127 127
128 private: 128 private:
129 explicit MediaControlOverlayPlayButtonElement(MediaControls&); 129 explicit MediaControlOverlayPlayButtonElement(MediaControls&);
130 130
131 virtual const AtomicString& shadowPseudoId() const override; 131 virtual const AtomicString& shadowPseudoId() const override;
132 virtual void defaultEventHandler(Event*) override;
132 virtual bool keepEventInNode(Event*) override; 133 virtual bool keepEventInNode(Event*) override;
133 }; 134 };
134 135
135 // ---------------------------- 136 // ----------------------------
136 137
137 class MediaControlToggleClosedCaptionsButtonElement final : public MediaControlI nputElement { 138 class MediaControlToggleClosedCaptionsButtonElement final : public MediaControlI nputElement {
138 public: 139 public:
139 static PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> create(MediaControls&); 140 static PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> create(MediaControls&);
140 141
141 virtual bool willRespondToMouseClickEvents() override { return true; } 142 virtual bool willRespondToMouseClickEvents() override { return true; }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 virtual RenderObject* createRenderer(RenderStyle*) override; 265 virtual RenderObject* createRenderer(RenderStyle*) override;
265 266
266 IntRect m_videoDisplaySize; 267 IntRect m_videoDisplaySize;
267 float m_fontSize; 268 float m_fontSize;
268 }; 269 };
269 270
270 271
271 } // namespace blink 272 } // namespace blink
272 273
273 #endif // MediaControlElements_h 274 #endif // MediaControlElements_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControlElements.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698