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

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

Issue 2770943003: Include control clip in list of clip-related properties. (Closed)
Patch Set: Merge branch 'master' into squash Created 3 years, 9 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. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 } 417 }
418 } 418 }
419 419
420 LayoutObject* LayoutObject::nextInPreOrder() const { 420 LayoutObject* LayoutObject::nextInPreOrder() const {
421 if (LayoutObject* o = slowFirstChild()) 421 if (LayoutObject* o = slowFirstChild())
422 return o; 422 return o;
423 423
424 return nextInPreOrderAfterChildren(); 424 return nextInPreOrderAfterChildren();
425 } 425 }
426 426
427 bool LayoutObject::hasClipRelatedProperty() const {
428 if (hasClip() || hasOverflowClip() || hasClipPath() ||
429 style()->containsPaint())
430 return true;
431 if (isBox() && toLayoutBox(this)->hasControlClip())
432 return true;
433 return false;
434 }
435
427 LayoutObject* LayoutObject::nextInPreOrderAfterChildren() const { 436 LayoutObject* LayoutObject::nextInPreOrderAfterChildren() const {
428 LayoutObject* o = nextSibling(); 437 LayoutObject* o = nextSibling();
429 if (!o) { 438 if (!o) {
430 o = parent(); 439 o = parent();
431 while (o && !o->nextSibling()) 440 while (o && !o->nextSibling())
432 o = o->parent(); 441 o = o->parent();
433 if (o) 442 if (o)
434 o = o->nextSibling(); 443 o = o->nextSibling();
435 } 444 }
436 445
(...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 const blink::LayoutObject* root = object1; 3654 const blink::LayoutObject* root = object1;
3646 while (root->parent()) 3655 while (root->parent())
3647 root = root->parent(); 3656 root = root->parent();
3648 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3657 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3649 } else { 3658 } else {
3650 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3659 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3651 } 3660 }
3652 } 3661 }
3653 3662
3654 #endif 3663 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698