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

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

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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 4455 matching lines...) Expand 10 before | Expand all | Expand 10 after
4466 if (lastRootBoxWithChildren->getLogicalEndBoxWithNode(logicallyLastBox)) 4466 if (lastRootBoxWithChildren->getLogicalEndBoxWithNode(logicallyLastBox))
4467 return PositionWithAffinity(positionForBox(logicallyLastBox, false)); 4467 return PositionWithAffinity(positionForBox(logicallyLastBox, false));
4468 } 4468 }
4469 4469
4470 // Can't reach this. We have a root line box, but it has no kids. 4470 // Can't reach this. We have a root line box, but it has no kids.
4471 // FIXME: This should ASSERT_NOT_REACHED(), but clicking on placeholder text 4471 // FIXME: This should ASSERT_NOT_REACHED(), but clicking on placeholder text
4472 // seems to hit this code path. 4472 // seems to hit this code path.
4473 return createPositionWithAffinity(0); 4473 return createPositionWithAffinity(0);
4474 } 4474 }
4475 4475
4476 #ifndef NDEBUG 4476 #if DCHECK_IS_ON()
4477 4477
4478 void LayoutBlockFlow::showLineTreeAndMark(const InlineBox* markedBox1, 4478 void LayoutBlockFlow::showLineTreeAndMark(const InlineBox* markedBox1,
4479 const char* markedLabel1, 4479 const char* markedLabel1,
4480 const InlineBox* markedBox2, 4480 const InlineBox* markedBox2,
4481 const char* markedLabel2, 4481 const char* markedLabel2,
4482 const LayoutObject* obj) const { 4482 const LayoutObject* obj) const {
4483 showLayoutObject(); 4483 showLayoutObject();
4484 for (const RootInlineBox* root = firstRootBox(); root; 4484 for (const RootInlineBox* root = firstRootBox(); root;
4485 root = root->nextRootBox()) 4485 root = root->nextRootBox())
4486 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, 4486 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
4551 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4551 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4552 } 4552 }
4553 4553
4554 void LayoutBlockFlow::invalidateDisplayItemClients( 4554 void LayoutBlockFlow::invalidateDisplayItemClients(
4555 PaintInvalidationReason invalidationReason) const { 4555 PaintInvalidationReason invalidationReason) const {
4556 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4556 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4557 invalidationReason); 4557 invalidationReason);
4558 } 4558 }
4559 4559
4560 } // namespace blink 4560 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698