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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 2143973005: [Layout API] Use layoutViewItem() in HTMLMediaElement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | 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) 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "core/html/track/AudioTrackList.h" 55 #include "core/html/track/AudioTrackList.h"
56 #include "core/html/track/AutomaticTrackSelection.h" 56 #include "core/html/track/AutomaticTrackSelection.h"
57 #include "core/html/track/CueTimeline.h" 57 #include "core/html/track/CueTimeline.h"
58 #include "core/html/track/InbandTextTrack.h" 58 #include "core/html/track/InbandTextTrack.h"
59 #include "core/html/track/TextTrackContainer.h" 59 #include "core/html/track/TextTrackContainer.h"
60 #include "core/html/track/TextTrackList.h" 60 #include "core/html/track/TextTrackList.h"
61 #include "core/html/track/VideoTrack.h" 61 #include "core/html/track/VideoTrack.h"
62 #include "core/html/track/VideoTrackList.h" 62 #include "core/html/track/VideoTrackList.h"
63 #include "core/inspector/ConsoleMessage.h" 63 #include "core/inspector/ConsoleMessage.h"
64 #include "core/layout/LayoutVideo.h" 64 #include "core/layout/LayoutVideo.h"
65 #include "core/layout/LayoutView.h"
66 #include "core/layout/api/LayoutMediaItem.h" 65 #include "core/layout/api/LayoutMediaItem.h"
66 #include "core/layout/api/LayoutViewItem.h"
67 #include "core/layout/compositing/PaintLayerCompositor.h" 67 #include "core/layout/compositing/PaintLayerCompositor.h"
68 #include "core/loader/FrameLoader.h" 68 #include "core/loader/FrameLoader.h"
69 #include "core/loader/FrameLoaderClient.h" 69 #include "core/loader/FrameLoaderClient.h"
70 #include "core/page/ChromeClient.h" 70 #include "core/page/ChromeClient.h"
71 #include "core/page/NetworkStateNotifier.h" 71 #include "core/page/NetworkStateNotifier.h"
72 #include "platform/ContentType.h" 72 #include "platform/ContentType.h"
73 #include "platform/Histogram.h" 73 #include "platform/Histogram.h"
74 #include "platform/LayoutTestSupport.h" 74 #include "platform/LayoutTestSupport.h"
75 #include "platform/Logging.h" 75 #include "platform/Logging.h"
76 #include "platform/MIMETypeFromURL.h" 76 #include "platform/MIMETypeFromURL.h"
(...skipping 3218 matching lines...) Expand 10 before | Expand all | Expand 10 after
3295 void HTMLMediaElement::didBecomeFullscreenElement() 3295 void HTMLMediaElement::didBecomeFullscreenElement()
3296 { 3296 {
3297 if (mediaControls()) 3297 if (mediaControls())
3298 mediaControls()->enteredFullscreen(); 3298 mediaControls()->enteredFullscreen();
3299 // FIXME: There is no embedder-side handling in layout test mode. 3299 // FIXME: There is no embedder-side handling in layout test mode.
3300 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest()) 3300 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
3301 webMediaPlayer()->enteredFullscreen(); 3301 webMediaPlayer()->enteredFullscreen();
3302 // Cache this in case the player is destroyed before leaving fullscreen. 3302 // Cache this in case the player is destroyed before leaving fullscreen.
3303 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo(); 3303 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo();
3304 if (m_inOverlayFullscreenVideo) 3304 if (m_inOverlayFullscreenVideo)
3305 document().layoutView()->compositor()->setNeedsCompositingUpdate(Composi tingUpdateRebuildTree); 3305 document().layoutViewItem().compositor()->setNeedsCompositingUpdate(Comp ositingUpdateRebuildTree);
3306 } 3306 }
3307 3307
3308 void HTMLMediaElement::willStopBeingFullscreenElement() 3308 void HTMLMediaElement::willStopBeingFullscreenElement()
3309 { 3309 {
3310 if (mediaControls()) 3310 if (mediaControls())
3311 mediaControls()->exitedFullscreen(); 3311 mediaControls()->exitedFullscreen();
3312 if (webMediaPlayer()) 3312 if (webMediaPlayer())
3313 webMediaPlayer()->exitedFullscreen(); 3313 webMediaPlayer()->exitedFullscreen();
3314 if (m_inOverlayFullscreenVideo) 3314 if (m_inOverlayFullscreenVideo)
3315 document().layoutView()->compositor()->setNeedsCompositingUpdate(Composi tingUpdateRebuildTree); 3315 document().layoutViewItem().compositor()->setNeedsCompositingUpdate(Comp ositingUpdateRebuildTree);
3316 m_inOverlayFullscreenVideo = false; 3316 m_inOverlayFullscreenVideo = false;
3317 } 3317 }
3318 3318
3319 WebLayer* HTMLMediaElement::platformLayer() const 3319 WebLayer* HTMLMediaElement::platformLayer() const
3320 { 3320 {
3321 return m_webLayer; 3321 return m_webLayer;
3322 } 3322 }
3323 3323
3324 bool HTMLMediaElement::hasClosedCaptions() const 3324 bool HTMLMediaElement::hasClosedCaptions() const
3325 { 3325 {
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
4033 4033
4034 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 4034 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
4035 { 4035 {
4036 IntRect result; 4036 IntRect result;
4037 if (LayoutObject* object = m_element->layoutObject()) 4037 if (LayoutObject* object = m_element->layoutObject())
4038 result = object->absoluteBoundingBoxRect(); 4038 result = object->absoluteBoundingBoxRect();
4039 return result; 4039 return result;
4040 } 4040 }
4041 4041
4042 } // namespace blink 4042 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698