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

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

Issue 2304563003: Add DISABLE_CFI_PERF attribute on the methods with CFI checks disabled. (Closed)
Patch Set: InlineBox Created 4 years, 3 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) 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutObject* st artChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRemoveInse rt = false) override; 255 void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutObject* st artChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRemoveInse rt = false) override;
256 256
257 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject& child) con st 257 LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject& child) con st
258 { 258 {
259 if (isHorizontalWritingMode()) 259 if (isHorizontalWritingMode())
260 return child.x() + child.layoutObject()->marginLeft(); 260 return child.x() + child.layoutObject()->marginLeft();
261 261
262 return child.x() + marginBeforeForChild(*child.layoutObject()); 262 return child.x() + marginBeforeForChild(*child.layoutObject());
263 } 263 }
264 264
265 DISABLE_CFI_PERF
265 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject& child) con st 266 LayoutUnit yPositionForFloatIncludingMargin(const FloatingObject& child) con st
266 { 267 {
267 if (isHorizontalWritingMode()) 268 if (isHorizontalWritingMode())
268 return child.y() + marginBeforeForChild(*child.layoutObject()); 269 return child.y() + marginBeforeForChild(*child.layoutObject());
269 270
270 return child.y() + child.layoutObject()->marginTop(); 271 return child.y() + child.layoutObject()->marginTop();
271 } 272 }
272 273
273 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, const Lay outPoint&) const; 274 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, const Lay outPoint&) const;
274 275
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 659
659 // END METHODS DEFINED IN LayoutBlockFlowLine 660 // END METHODS DEFINED IN LayoutBlockFlowLine
660 661
661 }; 662 };
662 663
663 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 664 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
664 665
665 } // namespace blink 666 } // namespace blink
666 667
667 #endif // LayoutBlockFlow_h 668 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698