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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

Issue 2557943002: Sync requestFullscreen() and exitFullscreen() algorithms with the spec (Closed)
Patch Set: rebase Created 4 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // Recursively find the document that is in fullscreen. 163 // Recursively find the document that is in fullscreen.
164 Element* fullscreenElement = Fullscreen::fullscreenElementFrom(document); 164 Element* fullscreenElement = Fullscreen::fullscreenElementFrom(document);
165 Document* contentDocument = &document; 165 Document* contentDocument = &document;
166 while (fullscreenElement && fullscreenElement->isFrameOwnerElement()) { 166 while (fullscreenElement && fullscreenElement->isFrameOwnerElement()) {
167 contentDocument = 167 contentDocument =
168 toHTMLFrameOwnerElement(fullscreenElement)->contentDocument(); 168 toHTMLFrameOwnerElement(fullscreenElement)->contentDocument();
169 if (!contentDocument) 169 if (!contentDocument)
170 return nullptr; 170 return nullptr;
171 fullscreenElement = Fullscreen::fullscreenElementFrom(*contentDocument); 171 fullscreenElement = Fullscreen::fullscreenElementFrom(*contentDocument);
172 } 172 }
173 // Get the current fullscreen element from the document.
174 // TODO(foolip): When |currentFullScreenElementFrom| is removed, this will
175 // become a no-op and can be removed. https://crbug.com/402421
176 fullscreenElement =
177 Fullscreen::currentFullScreenElementFrom(*contentDocument);
178 if (!isHTMLVideoElement(fullscreenElement)) 173 if (!isHTMLVideoElement(fullscreenElement))
179 return nullptr; 174 return nullptr;
180 LayoutObject* layoutObject = fullscreenElement->layoutObject(); 175 LayoutObject* layoutObject = fullscreenElement->layoutObject();
181 if (!layoutObject) 176 if (!layoutObject)
182 return nullptr; 177 return nullptr;
183 return toLayoutVideo(layoutObject); 178 return toLayoutVideo(layoutObject);
184 } 179 }
185 180
186 void PaintLayerCompositor::updateIfNeededRecursive() { 181 void PaintLayerCompositor::updateIfNeededRecursive() {
187 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime"); 182 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 } else if (graphicsLayer == m_scrollLayer.get()) { 1332 } else if (graphicsLayer == m_scrollLayer.get()) {
1338 name = "Frame Scrolling Layer"; 1333 name = "Frame Scrolling Layer";
1339 } else { 1334 } else {
1340 ASSERT_NOT_REACHED(); 1335 ASSERT_NOT_REACHED();
1341 } 1336 }
1342 1337
1343 return name; 1338 return name;
1344 } 1339 }
1345 1340
1346 } // namespace blink 1341 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutInline.cpp ('k') | third_party/WebKit/Source/modules/vr/VRDisplay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698