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

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

Issue 2513893002: Make ifdefs consistent in WebKit/Source/core/ (Closed)
Patch Set: Fix build. Update after review. Created 4 years, 1 month 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 3432 matching lines...) Expand 10 before | Expand all | Expand 10 after
3443 void LayoutObject::setMayNeedPaintInvalidationAnimatedBackgroundImage() { 3443 void LayoutObject::setMayNeedPaintInvalidationAnimatedBackgroundImage() {
3444 if (mayNeedPaintInvalidationAnimatedBackgroundImage()) 3444 if (mayNeedPaintInvalidationAnimatedBackgroundImage())
3445 return; 3445 return;
3446 m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(true); 3446 m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(true);
3447 setMayNeedPaintInvalidation(); 3447 setMayNeedPaintInvalidation();
3448 } 3448 }
3449 3449
3450 void LayoutObject::clearPaintInvalidationFlags() { 3450 void LayoutObject::clearPaintInvalidationFlags() {
3451 // paintInvalidationStateIsDirty should be kept in sync with the 3451 // paintInvalidationStateIsDirty should be kept in sync with the
3452 // booleans that are cleared below. 3452 // booleans that are cleared below.
3453 #ifndef NDEBUG
3453 ASSERT(!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() || 3454 ASSERT(!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() ||
3454 paintInvalidationStateIsDirty()); 3455 paintInvalidationStateIsDirty());
Alexander Alekseev 2016/11/18 22:32:15 paintInvalidationStateIsDirty() is defined only if
3456 #endif
3455 clearShouldDoFullPaintInvalidation(); 3457 clearShouldDoFullPaintInvalidation();
3456 m_bitfields.setChildShouldCheckForPaintInvalidation(false); 3458 m_bitfields.setChildShouldCheckForPaintInvalidation(false);
3457 m_bitfields.setMayNeedPaintInvalidation(false); 3459 m_bitfields.setMayNeedPaintInvalidation(false);
3458 m_bitfields.setMayNeedPaintInvalidationSubtree(false); 3460 m_bitfields.setMayNeedPaintInvalidationSubtree(false);
3459 m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(false); 3461 m_bitfields.setMayNeedPaintInvalidationAnimatedBackgroundImage(false);
3460 m_bitfields.setShouldInvalidateSelection(false); 3462 m_bitfields.setShouldInvalidateSelection(false);
3461 m_bitfields.setBackgroundChangedSinceLastPaintInvalidation(false); 3463 m_bitfields.setBackgroundChangedSinceLastPaintInvalidation(false);
3462 } 3464 }
3463 3465
3464 bool LayoutObject::isAllowedToModifyLayoutTreeStructure(Document& document) { 3466 bool LayoutObject::isAllowedToModifyLayoutTreeStructure(Document& document) {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
3547 const blink::LayoutObject* root = object1; 3549 const blink::LayoutObject* root = object1;
3548 while (root->parent()) 3550 while (root->parent())
3549 root = root->parent(); 3551 root = root->parent();
3550 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3552 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3551 } else { 3553 } else {
3552 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3554 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3553 } 3555 }
3554 } 3556 }
3555 3557
3556 #endif 3558 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698