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

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

Issue 2774443004: Fix overflow rect calculation for float in rtl container. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 using LayoutBoxModelObject::moveChildrenTo; 321 using LayoutBoxModelObject::moveChildrenTo;
322 void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, 322 void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject,
323 LayoutObject* startChild, 323 LayoutObject* startChild,
324 LayoutObject* endChild, 324 LayoutObject* endChild,
325 LayoutObject* beforeChild, 325 LayoutObject* beforeChild,
326 bool fullRemoveInsert = false) override; 326 bool fullRemoveInsert = false) override;
327 327
328 LayoutUnit xPositionForFloatIncludingMargin( 328 LayoutUnit xPositionForFloatIncludingMargin(
329 const FloatingObject& child) const { 329 const FloatingObject& child) const {
330 if (isHorizontalWritingMode()) 330 LayoutUnit scrollbarAdjustment(originAdjustmentForScrollbars().width());
331 return child.x() + child.layoutObject()->marginLeft(); 331 if (isHorizontalWritingMode()) {
332 332 return child.x() + child.layoutObject()->marginLeft() +
333 scrollbarAdjustment;
334 }
333 return child.x() + marginBeforeForChild(*child.layoutObject()); 335 return child.x() + marginBeforeForChild(*child.layoutObject());
334 } 336 }
335 337
336 DISABLE_CFI_PERF 338 DISABLE_CFI_PERF
337 LayoutUnit yPositionForFloatIncludingMargin( 339 LayoutUnit yPositionForFloatIncludingMargin(
338 const FloatingObject& child) const { 340 const FloatingObject& child) const {
339 if (isHorizontalWritingMode()) 341 if (isHorizontalWritingMode())
340 return child.y() + marginBeforeForChild(*child.layoutObject()); 342 return child.y() + marginBeforeForChild(*child.layoutObject());
341 343
342 return child.y() + child.layoutObject()->marginTop(); 344 return child.y() + child.layoutObject()->marginTop();
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 void positionDialog(); 955 void positionDialog();
954 956
955 // END METHODS DEFINED IN LayoutBlockFlowLine 957 // END METHODS DEFINED IN LayoutBlockFlowLine
956 }; 958 };
957 959
958 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 960 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
959 961
960 } // namespace blink 962 } // namespace blink
961 963
962 #endif // LayoutBlockFlow_h 964 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698