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

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

Issue 199413008: Simplify MediaControls::show() and hide() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | 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 23 matching lines...) Expand all
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 // ---------------------------- 37 // ----------------------------
38 38
39 class MediaControlPanelElement FINAL : public MediaControlDivElement { 39 class MediaControlPanelElement FINAL : public MediaControlDivElement {
40 public: 40 public:
41 static PassRefPtr<MediaControlPanelElement> create(MediaControls&); 41 static PassRefPtr<MediaControlPanelElement> create(MediaControls&);
42 42
43 void setCanBeDragged(bool); 43 void setCanBeDragged(bool);
44 void setIsDisplayed(bool);
45 44
46 void resetPosition(); 45 void resetPosition();
47 void makeOpaque(); 46 void makeOpaque();
48 void makeTransparent(); 47 void makeTransparent();
49 48
50 virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; } 49 virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
51 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; } 50 virtual bool willRespondToMouseClickEvents() OVERRIDE { return true; }
52 51
53 private: 52 private:
54 explicit MediaControlPanelElement(MediaControls&); 53 explicit MediaControlPanelElement(MediaControls&);
55 54
56 virtual const AtomicString& shadowPseudoId() const OVERRIDE; 55 virtual const AtomicString& shadowPseudoId() const OVERRIDE;
57 virtual void defaultEventHandler(Event*) OVERRIDE; 56 virtual void defaultEventHandler(Event*) OVERRIDE;
58 57
59 void startDrag(const LayoutPoint& eventLocation); 58 void startDrag(const LayoutPoint& eventLocation);
60 void continueDrag(const LayoutPoint& eventLocation); 59 void continueDrag(const LayoutPoint& eventLocation);
61 void endDrag(); 60 void endDrag();
62 61
63 void startTimer(); 62 void startTimer();
64 void stopTimer(); 63 void stopTimer();
65 void transitionTimerFired(Timer<MediaControlPanelElement>*); 64 void transitionTimerFired(Timer<MediaControlPanelElement>*);
66 65
67 void setPosition(const LayoutPoint&); 66 void setPosition(const LayoutPoint&);
68 67
69 bool m_canBeDragged; 68 bool m_canBeDragged;
70 bool m_isBeingDragged; 69 bool m_isBeingDragged;
71 bool m_isDisplayed;
72 bool m_opaque; 70 bool m_opaque;
73 LayoutPoint m_lastDragEventLocation; 71 LayoutPoint m_lastDragEventLocation;
74 LayoutPoint m_cumulativeDragOffset; 72 LayoutPoint m_cumulativeDragOffset;
75 73
76 Timer<MediaControlPanelElement> m_transitionTimer; 74 Timer<MediaControlPanelElement> m_transitionTimer;
77 }; 75 };
78 76
79 // ---------------------------- 77 // ----------------------------
80 78
81 class MediaControlPanelEnclosureElement FINAL : public MediaControlDivElement { 79 class MediaControlPanelEnclosureElement FINAL : public MediaControlDivElement {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE; 251 virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
254 252
255 IntRect m_videoDisplaySize; 253 IntRect m_videoDisplaySize;
256 float m_fontSize; 254 float m_fontSize;
257 }; 255 };
258 256
259 257
260 } // namespace WebCore 258 } // namespace WebCore
261 259
262 #endif // MediaControlElements_h 260 #endif // MediaControlElements_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/shadow/MediaControlElements.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698