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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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) 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 { 118 {
119 if (!m_isBeingDragged) 119 if (!m_isBeingDragged)
120 return; 120 return;
121 121
122 m_isBeingDragged = false; 122 m_isBeingDragged = false;
123 123
124 Frame* frame = document().frame(); 124 Frame* frame = document().frame();
125 if (!frame) 125 if (!frame)
126 return; 126 return;
127 127
128 frame->eventHandler().setCapturingMouseEventsNode(0); 128 frame->eventHandler().setCapturingMouseEventsNode(nullptr);
129 } 129 }
130 130
131 void MediaControlPanelElement::startTimer() 131 void MediaControlPanelElement::startTimer()
132 { 132 {
133 stopTimer(); 133 stopTimer();
134 134
135 // The timer is required to set the property display:'none' on the panel, 135 // The timer is required to set the property display:'none' on the panel,
136 // such that captions are correctly displayed at the bottom of the video 136 // such that captions are correctly displayed at the bottom of the video
137 // at the end of the fadeout transition. 137 // at the end of the fadeout transition.
138 // FIXME: Racing a transition with a setTimeout like this is wrong. 138 // FIXME: Racing a transition with a setTimeout like this is wrong.
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 float fontSize = smallestDimension * 0.05f; 746 float fontSize = smallestDimension * 0.05f;
747 if (fontSize != m_fontSize) { 747 if (fontSize != m_fontSize) {
748 m_fontSize = fontSize; 748 m_fontSize = fontSize;
749 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 749 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
750 } 750 }
751 } 751 }
752 752
753 // ---------------------------- 753 // ----------------------------
754 754
755 } // namespace WebCore 755 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/shadow/ClearButtonElement.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698