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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

Issue 2513893002: Make ifdefs consistent in WebKit/Source/core/ (Closed)
Patch Set: Limited fix to /core/ only. Created 4 years 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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 } 392 }
393 393
394 LayoutUnit logicalHeightWithVisibleOverflow() const final; 394 LayoutUnit logicalHeightWithVisibleOverflow() const final;
395 395
396 // This function is only public so we can call it from NGBox while we're 396 // This function is only public so we can call it from NGBox while we're
397 // still working on LayoutNG. 397 // still working on LayoutNG.
398 void updateIsSelfCollapsing() { 398 void updateIsSelfCollapsing() {
399 m_isSelfCollapsing = checkIfIsSelfCollapsingBlock(); 399 m_isSelfCollapsing = checkIfIsSelfCollapsingBlock();
400 } 400 }
401 401
402 #ifndef NDEBUG 402 #if DCHECK_IS_ON()
403 void showLineTreeAndMark(const InlineBox* = nullptr, 403 void showLineTreeAndMark(const InlineBox* = nullptr,
404 const char* = nullptr, 404 const char* = nullptr,
405 const InlineBox* = nullptr, 405 const InlineBox* = nullptr,
406 const char* = nullptr, 406 const char* = nullptr,
407 const LayoutObject* = nullptr) const; 407 const LayoutObject* = nullptr) const;
408 #endif 408 #endif
409 409
410 protected: 410 protected:
411 void rebuildFloatsFromIntruding(); 411 void rebuildFloatsFromIntruding();
412 void layoutInlineChildren(bool relayoutChildren, LayoutUnit afterEdge); 412 void layoutInlineChildren(bool relayoutChildren, LayoutUnit afterEdge);
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 void positionDialog(); 943 void positionDialog();
944 944
945 // END METHODS DEFINED IN LayoutBlockFlowLine 945 // END METHODS DEFINED IN LayoutBlockFlowLine
946 }; 946 };
947 947
948 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 948 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
949 949
950 } // namespace blink 950 } // namespace blink
951 951
952 #endif // LayoutBlockFlow_h 952 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698