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

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

Issue 1410833004: Revert "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 10 matching lines...) Expand all
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/layout/LayoutInline.h" 24 #include "core/layout/LayoutInline.h"
25 25
26 #include "core/dom/Fullscreen.h" 26 #include "core/dom/Fullscreen.h"
27 #include "core/dom/StyleEngine.h" 27 #include "core/dom/StyleEngine.h"
28 #include "core/layout/HitTestResult.h" 28 #include "core/layout/HitTestResult.h"
29 #include "core/layout/LayoutBlock.h" 29 #include "core/layout/LayoutBlock.h"
30 #include "core/layout/LayoutFlowThread.h" 30 #include "core/layout/LayoutFlowThread.h"
31 #include "core/layout/LayoutFullScreen.h"
31 #include "core/layout/LayoutGeometryMap.h" 32 #include "core/layout/LayoutGeometryMap.h"
32 #include "core/layout/LayoutTheme.h" 33 #include "core/layout/LayoutTheme.h"
33 #include "core/layout/LayoutView.h" 34 #include "core/layout/LayoutView.h"
34 #include "core/layout/api/LineLayoutBoxModel.h" 35 #include "core/layout/api/LineLayoutBoxModel.h"
35 #include "core/layout/line/InlineTextBox.h" 36 #include "core/layout/line/InlineTextBox.h"
36 #include "core/paint/BoxPainter.h" 37 #include "core/paint/BoxPainter.h"
37 #include "core/paint/InlinePainter.h" 38 #include "core/paint/InlinePainter.h"
38 #include "core/paint/ObjectPainter.h" 39 #include "core/paint/ObjectPainter.h"
39 #include "core/paint/PaintLayer.h" 40 #include "core/paint/PaintLayer.h"
40 #include "core/style/StyleInheritedData.h" 41 #include "core/style/StyleInheritedData.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 child = currentChild->nextSibling(); 344 child = currentChild->nextSibling();
344 to->addChildIgnoringContinuation(children()->removeChildNode(this, curre ntChild), nullptr); 345 to->addChildIgnoringContinuation(children()->removeChildNode(this, curre ntChild), nullptr);
345 } 346 }
346 } 347 }
347 348
348 void LayoutInline::splitInlines(LayoutBlock* fromBlock, LayoutBlock* toBlock, 349 void LayoutInline::splitInlines(LayoutBlock* fromBlock, LayoutBlock* toBlock,
349 LayoutBlock* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObject* o ldCont) 350 LayoutBlock* middleBlock, LayoutObject* beforeChild, LayoutBoxModelObject* o ldCont)
350 { 351 {
351 ASSERT(isDescendantOf(fromBlock)); 352 ASSERT(isDescendantOf(fromBlock));
352 353
354 // If we're splitting the inline containing the fullscreened element,
355 // |beforeChild| may be the layoutObject for the fullscreened element. Howev er,
356 // that layoutObject is wrapped in a LayoutFullScreen, so |this| is not its
357 // parent. Since the splitting logic expects |this| to be the parent, set
358 // |beforeChild| to be the LayoutFullScreen.
359 if (Fullscreen* fullscreen = Fullscreen::fromIfExists(document())) {
360 const Element* fullScreenElement = fullscreen->webkitCurrentFullScreenEl ement();
361 if (fullScreenElement && beforeChild && beforeChild->node() == fullScree nElement)
362 beforeChild = fullscreen->fullScreenLayoutObject();
363 }
364
353 // FIXME: Because splitting is O(n^2) as tags nest pathologically, we cap th e depth at which we're willing to clone. 365 // FIXME: Because splitting is O(n^2) as tags nest pathologically, we cap th e depth at which we're willing to clone.
354 // There will eventually be a better approach to this problem that will let us nest to a much 366 // There will eventually be a better approach to this problem that will let us nest to a much
355 // greater depth (see bugzilla bug 13430) but for now we have a limit. This *will* result in 367 // greater depth (see bugzilla bug 13430) but for now we have a limit. This *will* result in
356 // incorrect rendering, but the alternative is to hang forever. 368 // incorrect rendering, but the alternative is to hang forever.
357 const unsigned cMaxSplitDepth = 200; 369 const unsigned cMaxSplitDepth = 200;
358 Vector<LayoutInline*> inlinesToClone; 370 Vector<LayoutInline*> inlinesToClone;
359 LayoutInline* topMostInline = this; 371 LayoutInline* topMostInline = this;
360 for (LayoutObject* o = this; o != fromBlock; o = o->parent()) { 372 for (LayoutObject* o = this; o != fromBlock; o = o->parent()) {
361 topMostInline = toLayoutInline(o); 373 topMostInline = toLayoutInline(o);
362 if (inlinesToClone.size() < cMaxSplitDepth) 374 if (inlinesToClone.size() < cMaxSplitDepth)
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 } 1405 }
1394 1406
1395 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason, const Layout Rect& previousPaintInvalidationRect, const LayoutRect& newPaintInvalidationRect) const 1407 void LayoutInline::invalidateDisplayItemClients(const LayoutBoxModelObject& pain tInvalidationContainer, PaintInvalidationReason invalidationReason, const Layout Rect& previousPaintInvalidationRect, const LayoutRect& newPaintInvalidationRect) const
1396 { 1408 {
1397 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason, previousPaintInvalidationRect, newPaintInvalidationRect); 1409 LayoutBoxModelObject::invalidateDisplayItemClients(paintInvalidationContaine r, invalidationReason, previousPaintInvalidationRect, newPaintInvalidationRect);
1398 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1410 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1399 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, previousPaintInvalidationRect, newPaintInvalidationRect); 1411 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, previousPaintInvalidationRect, newPaintInvalidationRect);
1400 } 1412 }
1401 1413
1402 } // namespace blink 1414 } // 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