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

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

Issue 219283004: Remove what remains of MediaControllerInterface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: earliest possible position FIXME Created 6 years, 8 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/shadow/MediaControlElements.h ('k') | Source/core/html/shadow/MediaControls.h » ('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 20 matching lines...) Expand all
31 #include "core/html/shadow/MediaControlElements.h" 31 #include "core/html/shadow/MediaControlElements.h"
32 32
33 #include "RuntimeEnabledFeatures.h" 33 #include "RuntimeEnabledFeatures.h"
34 #include "bindings/v8/ExceptionStatePlaceholder.h" 34 #include "bindings/v8/ExceptionStatePlaceholder.h"
35 #include "core/dom/DOMTokenList.h" 35 #include "core/dom/DOMTokenList.h"
36 #include "core/dom/FullscreenElementStack.h" 36 #include "core/dom/FullscreenElementStack.h"
37 #include "core/dom/shadow/ShadowRoot.h" 37 #include "core/dom/shadow/ShadowRoot.h"
38 #include "core/events/MouseEvent.h" 38 #include "core/events/MouseEvent.h"
39 #include "core/frame/LocalFrame.h" 39 #include "core/frame/LocalFrame.h"
40 #include "core/html/HTMLVideoElement.h" 40 #include "core/html/HTMLVideoElement.h"
41 #include "core/html/MediaController.h"
41 #include "core/html/shadow/MediaControls.h" 42 #include "core/html/shadow/MediaControls.h"
42 #include "core/html/track/TextTrack.h" 43 #include "core/html/track/TextTrack.h"
43 #include "core/html/track/vtt/VTTRegionList.h" 44 #include "core/html/track/vtt/VTTRegionList.h"
44 #include "core/page/EventHandler.h" 45 #include "core/page/EventHandler.h"
45 #include "core/rendering/RenderMediaControlElements.h" 46 #include "core/rendering/RenderMediaControlElements.h"
46 #include "core/rendering/RenderSlider.h" 47 #include "core/rendering/RenderSlider.h"
47 #include "core/rendering/RenderTheme.h" 48 #include "core/rendering/RenderTheme.h"
48 #include "core/rendering/RenderVideo.h" 49 #include "core/rendering/RenderVideo.h"
49 50
50 namespace WebCore { 51 namespace WebCore {
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 366
366 if (event->type() == EventTypeNames::mouseup) 367 if (event->type() == EventTypeNames::mouseup)
367 mediaControls().endScrubbing(); 368 mediaControls().endScrubbing();
368 369
369 MediaControlInputElement::defaultEventHandler(event); 370 MediaControlInputElement::defaultEventHandler(event);
370 371
371 if (event->type() == EventTypeNames::mouseover || event->type() == EventType Names::mouseout || event->type() == EventTypeNames::mousemove) 372 if (event->type() == EventTypeNames::mouseover || event->type() == EventType Names::mouseout || event->type() == EventTypeNames::mousemove)
372 return; 373 return;
373 374
374 double time = value().toDouble(); 375 double time = value().toDouble();
375 if (event->type() == EventTypeNames::input && time != mediaControllerInterfa ce().currentTime()) 376 if (event->type() == EventTypeNames::input) {
376 mediaControllerInterface().setCurrentTime(time, IGNORE_EXCEPTION); 377 if (mediaElement().controller())
378 mediaElement().controller()->setCurrentTime(time, IGNORE_EXCEPTION);
379 else
380 mediaElement().setCurrentTime(time, IGNORE_EXCEPTION);
381 }
377 382
378 RenderSlider* slider = toRenderSlider(renderer()); 383 RenderSlider* slider = toRenderSlider(renderer());
379 if (slider && slider->inDragMode()) 384 if (slider && slider->inDragMode())
380 mediaControls().updateCurrentTimeDisplay(); 385 mediaControls().updateCurrentTimeDisplay();
381 } 386 }
382 387
383 bool MediaControlTimelineElement::willRespondToMouseClickEvents() 388 bool MediaControlTimelineElement::willRespondToMouseClickEvents()
384 { 389 {
385 return inDocument() && document().isActive(); 390 return inDocument() && document().isActive();
386 } 391 }
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 float fontSize = smallestDimension * 0.05f; 674 float fontSize = smallestDimension * 0.05f;
670 if (fontSize != m_fontSize) { 675 if (fontSize != m_fontSize) {
671 m_fontSize = fontSize; 676 m_fontSize = fontSize;
672 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX); 677 setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue: :CSS_PX);
673 } 678 }
674 } 679 }
675 680
676 // ---------------------------- 681 // ----------------------------
677 682
678 } // namespace WebCore 683 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.h ('k') | Source/core/html/shadow/MediaControls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698