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

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

Issue 2107233002: Reland "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: new untested DCHECK 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
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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "core/layout/LayoutInline.h" 23 #include "core/layout/LayoutInline.h"
24 24
25 #include "core/dom/Fullscreen.h" 25 #include "core/dom/Fullscreen.h"
26 #include "core/dom/StyleEngine.h" 26 #include "core/dom/StyleEngine.h"
27 #include "core/layout/HitTestResult.h" 27 #include "core/layout/HitTestResult.h"
28 #include "core/layout/LayoutBlock.h" 28 #include "core/layout/LayoutBlock.h"
29 #include "core/layout/LayoutFullScreen.h"
30 #include "core/layout/LayoutGeometryMap.h" 29 #include "core/layout/LayoutGeometryMap.h"
31 #include "core/layout/LayoutTheme.h" 30 #include "core/layout/LayoutTheme.h"
32 #include "core/layout/LayoutView.h" 31 #include "core/layout/LayoutView.h"
33 #include "core/layout/api/LineLayoutBoxModel.h" 32 #include "core/layout/api/LineLayoutBoxModel.h"
34 #include "core/layout/line/InlineTextBox.h" 33 #include "core/layout/line/InlineTextBox.h"
35 #include "core/paint/BoxPainter.h" 34 #include "core/paint/BoxPainter.h"
36 #include "core/paint/InlinePainter.h" 35 #include "core/paint/InlinePainter.h"
37 #include "core/paint/ObjectPainter.h" 36 #include "core/paint/ObjectPainter.h"
38 #include "core/paint/PaintLayer.h" 37 #include "core/paint/PaintLayer.h"
39 #include "core/style/StyleInheritedData.h" 38 #include "core/style/StyleInheritedData.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 child = currentChild->nextSibling(); 342 child = currentChild->nextSibling();
344 to->addChildIgnoringContinuation(children()->removeChildNode(this, curre ntChild), nullptr); 343 to->addChildIgnoringContinuation(children()->removeChildNode(this, curre ntChild), nullptr);
345 } 344 }
346 } 345 }
347 346
348 void LayoutInline::splitInlines(LayoutBlockFlow* fromBlock, LayoutBlockFlow* toB lock, 347 void LayoutInline::splitInlines(LayoutBlockFlow* fromBlock, LayoutBlockFlow* toB lock,
349 LayoutBlockFlow* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObjec t* oldCont) 348 LayoutBlockFlow* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObjec t* oldCont)
350 { 349 {
351 ASSERT(isDescendantOf(fromBlock)); 350 ASSERT(isDescendantOf(fromBlock));
352 351
353 // If we're splitting the inline containing the fullscreened element,
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
356 // parent. Since the splitting logic expects |this| to be the parent, set
357 // |beforeChild| to be the LayoutFullScreen.
358 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document())) {
359 const Element* fullScreenElement = fullscreen->webkitCurrentFullScreenEl ement();
360 if (fullScreenElement && beforeChild && beforeChild->node() == fullScree nElement)
361 beforeChild = fullscreen->fullScreenLayoutObject();
362 }
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. 352 // 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 353 // 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 354 // 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. 355 // incorrect rendering, but the alternative is to hang forever.
368 const unsigned cMaxSplitDepth = 200; 356 const unsigned cMaxSplitDepth = 200;
369 Vector<LayoutInline*> inlinesToClone; 357 Vector<LayoutInline*> inlinesToClone;
370 LayoutInline* topMostInline = this; 358 LayoutInline* topMostInline = this;
371 for (LayoutObject* o = this; o != fromBlock; o = o->parent()) { 359 for (LayoutObject* o = this; o != fromBlock; o = o->parent()) {
372 topMostInline = toLayoutInline(o); 360 topMostInline = toLayoutInline(o);
373 if (inlinesToClone.size() < cMaxSplitDepth) 361 if (inlinesToClone.size() < cMaxSplitDepth)
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 1352
1365 void LayoutInline::invalidateDisplayItemClients(PaintInvalidationReason invalida tionReason) const 1353 void LayoutInline::invalidateDisplayItemClients(PaintInvalidationReason invalida tionReason) const
1366 { 1354 {
1367 LayoutBoxModelObject::invalidateDisplayItemClients(invalidationReason); 1355 LayoutBoxModelObject::invalidateDisplayItemClients(invalidationReason);
1368 1356
1369 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1357 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1370 invalidateDisplayItemClient(*box, invalidationReason); 1358 invalidateDisplayItemClient(*box, invalidationReason);
1371 } 1359 }
1372 1360
1373 } // namespace blink 1361 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFullScreen.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698