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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.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 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2053 matching lines...) Expand 10 before | Expand all | Expand 10 after
2064 void LayoutObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly) 2064 void LayoutObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly)
2065 { 2065 {
2066 // FIXME: We could save this call when the change only affected non-inherite d properties. 2066 // FIXME: We could save this call when the change only affected non-inherite d properties.
2067 for (LayoutObject* child = slowFirstChild(); child; child = child->nextSibli ng()) { 2067 for (LayoutObject* child = slowFirstChild(); child; child = child->nextSibli ng()) {
2068 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO) 2068 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO)
2069 continue; 2069 continue;
2070 2070
2071 if (blockChildrenOnly && !child->isLayoutBlock()) 2071 if (blockChildrenOnly && !child->isLayoutBlock())
2072 continue; 2072 continue;
2073 2073
2074 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( ))
2075 continue;
2076
2074 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display()); 2077 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display());
2075 2078
2076 // Preserve the position style of anonymous block continuations as they can have relative position when 2079 // Preserve the position style of anonymous block continuations as they can have relative position when
2077 // they contain block descendants of relative positioned inlines. 2080 // they contain block descendants of relative positioned inlines.
2078 if (child->isInFlowPositioned() && toLayoutBlock(child)->isAnonymousBloc kContinuation()) 2081 if (child->isInFlowPositioned() && toLayoutBlock(child)->isAnonymousBloc kContinuation())
2079 newStyle->setPosition(child->style()->position()); 2082 newStyle->setPosition(child->style()->position());
2080 2083
2081 updateAnonymousChildStyle(*child, *newStyle); 2084 updateAnonymousChildStyle(*child, *newStyle);
2082 2085
2083 child->setStyle(newStyle.release()); 2086 child->setStyle(newStyle.release());
(...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after
3489 const blink::LayoutObject* root = object1; 3492 const blink::LayoutObject* root = object1;
3490 while (root->parent()) 3493 while (root->parent())
3491 root = root->parent(); 3494 root = root->parent();
3492 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3495 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3493 } else { 3496 } else {
3494 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3497 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3495 } 3498 }
3496 } 3499 }
3497 3500
3498 #endif 3501 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutVideo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698