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

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

Issue 830183005: Re-enable the activation behavior of media elements (click to play/pause) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: simplify test 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
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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 virtual bool rendererIsNeeded(const RenderStyle&) override; 339 virtual bool rendererIsNeeded(const RenderStyle&) override;
340 virtual RenderObject* createRenderer(RenderStyle*) override; 340 virtual RenderObject* createRenderer(RenderStyle*) override;
341 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override f inal; 341 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override f inal;
342 virtual void didNotifySubtreeInsertionsToDocument() override; 342 virtual void didNotifySubtreeInsertionsToDocument() override;
343 virtual void removedFrom(ContainerNode*) override final; 343 virtual void removedFrom(ContainerNode*) override final;
344 virtual void didRecalcStyle(StyleRecalcChange) override final; 344 virtual void didRecalcStyle(StyleRecalcChange) override final;
345 345
346 virtual void didBecomeFullscreenElement() override final; 346 virtual void didBecomeFullscreenElement() override final;
347 virtual void willStopBeingFullscreenElement() override final; 347 virtual void willStopBeingFullscreenElement() override final;
348 virtual bool isInteractiveContent() const override final; 348 virtual bool isInteractiveContent() const override final;
349 virtual bool willRespondToMouseClickEvents() override final;
349 virtual void defaultEventHandler(Event*) override final; 350 virtual void defaultEventHandler(Event*) override final;
350 351
351 // ActiveDOMObject functions. 352 // ActiveDOMObject functions.
352 virtual void stop() override final; 353 virtual void stop() override final;
353 354
354 virtual void updateDisplayState() { } 355 virtual void updateDisplayState() { }
355 356
356 void setReadyState(ReadyState); 357 void setReadyState(ReadyState);
357 void setNetworkState(blink::WebMediaPlayer::NetworkState); 358 void setNetworkState(blink::WebMediaPlayer::NetworkState);
358 359
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 inline bool isHTMLMediaElement(const HTMLElement& element) 631 inline bool isHTMLMediaElement(const HTMLElement& element)
631 { 632 {
632 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 633 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
633 } 634 }
634 635
635 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 636 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
636 637
637 } // namespace blink 638 } // namespace blink
638 639
639 #endif // HTMLMediaElement_h 640 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698