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

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

Issue 2199783002: Clarify fullscreenElement vs. currentFullScreenElement distinction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 LayoutBlockFlow* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObjec t* oldCont) 349 LayoutBlockFlow* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObjec t* oldCont)
350 { 350 {
351 ASSERT(isDescendantOf(fromBlock)); 351 ASSERT(isDescendantOf(fromBlock));
352 352
353 // If we're splitting the inline containing the fullscreened element, 353 // If we're splitting the inline containing the fullscreened element,
354 // |beforeChild| may be the layoutObject for the fullscreened element. Howev er, 354 // |beforeChild| may be the layoutObject for the fullscreened element. Howev er,
355 // that layoutObject is wrapped in a LayoutFullScreen, so |this| is not its 355 // that layoutObject is wrapped in a LayoutFullScreen, so |this| is not its
356 // parent. Since the splitting logic expects |this| to be the parent, set 356 // parent. Since the splitting logic expects |this| to be the parent, set
357 // |beforeChild| to be the LayoutFullScreen. 357 // |beforeChild| to be the LayoutFullScreen.
358 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document())) { 358 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document())) {
359 const Element* fullScreenElement = fullscreen->webkitCurrentFullScreenEl ement(); 359 const Element* fullScreenElement = fullscreen->currentFullScreenElement( );
360 if (fullScreenElement && beforeChild && beforeChild->node() == fullScree nElement) 360 if (fullScreenElement && beforeChild && beforeChild->node() == fullScree nElement)
361 beforeChild = fullscreen->fullScreenLayoutObject(); 361 beforeChild = fullscreen->fullScreenLayoutObject();
362 } 362 }
363 363
364 // FIXME: Because splitting is O(n^2) as tags nest pathologically, we cap th e depth at which we're willing to clone. 364 // FIXME: Because splitting is O(n^2) as tags nest pathologically, we cap th e depth at which we're willing to clone.
365 // There will eventually be a better approach to this problem that will let us nest to a much 365 // There will eventually be a better approach to this problem that will let us nest to a much
366 // greater depth (see bugzilla bug 13430) but for now we have a limit. This *will* result in 366 // greater depth (see bugzilla bug 13430) but for now we have a limit. This *will* result in
367 // incorrect rendering, but the alternative is to hang forever. 367 // incorrect rendering, but the alternative is to hang forever.
368 const unsigned cMaxSplitDepth = 200; 368 const unsigned cMaxSplitDepth = 200;
369 Vector<LayoutInline*> inlinesToClone; 369 Vector<LayoutInline*> inlinesToClone;
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 1359
1360 void LayoutInline::invalidateDisplayItemClients(PaintInvalidationReason invalida tionReason) const 1360 void LayoutInline::invalidateDisplayItemClients(PaintInvalidationReason invalida tionReason) const
1361 { 1361 {
1362 LayoutBoxModelObject::invalidateDisplayItemClients(invalidationReason); 1362 LayoutBoxModelObject::invalidateDisplayItemClients(invalidationReason);
1363 1363
1364 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1364 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1365 invalidateDisplayItemClient(*box, invalidationReason); 1365 invalidateDisplayItemClient(*box, invalidationReason);
1366 } 1366 }
1367 1367
1368 } // namespace blink 1368 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698