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

Side by Side Diff: third_party/WebKit/Source/core/editing/VisibleUnits.cpp

Issue 1648573002: Transition to explicit constructors in LayoutUnit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove int constructors for size/point... they result in incorrect conversions until LayoutUnit is … Created 4 years, 10 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/layout/LayoutBlockFlow.h » ('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) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 static inline LayoutPoint absoluteLineDirectionPointToLocalPointInBlock(RootInli neBox* root, LayoutUnit lineDirectionPoint) 1268 static inline LayoutPoint absoluteLineDirectionPointToLocalPointInBlock(RootInli neBox* root, LayoutUnit lineDirectionPoint)
1269 { 1269 {
1270 ASSERT(root); 1270 ASSERT(root);
1271 LayoutBlockFlow& containingBlock = root->block(); 1271 LayoutBlockFlow& containingBlock = root->block();
1272 FloatPoint absoluteBlockPoint = containingBlock.localToAbsolute(FloatPoint() ); 1272 FloatPoint absoluteBlockPoint = containingBlock.localToAbsolute(FloatPoint() );
1273 if (containingBlock.hasOverflowClip()) 1273 if (containingBlock.hasOverflowClip())
1274 absoluteBlockPoint -= FloatSize(containingBlock.scrolledContentOffset()) ; 1274 absoluteBlockPoint -= FloatSize(containingBlock.scrolledContentOffset()) ;
1275 1275
1276 if (root->block().isHorizontalWritingMode()) 1276 if (root->block().isHorizontalWritingMode())
1277 return LayoutPoint(lineDirectionPoint - absoluteBlockPoint.x(), root->bl ockDirectionPointInLine()); 1277 return LayoutPoint(LayoutUnit(lineDirectionPoint - absoluteBlockPoint.x( )), root->blockDirectionPointInLine());
1278 1278
1279 return LayoutPoint(root->blockDirectionPointInLine(), lineDirectionPoint - a bsoluteBlockPoint.y()); 1279 return LayoutPoint(root->blockDirectionPointInLine(), LayoutUnit(lineDirecti onPoint - absoluteBlockPoint.y()));
1280 } 1280 }
1281 1281
1282 VisiblePosition previousLinePosition(const VisiblePosition& visiblePosition, Lay outUnit lineDirectionPoint, EditableType editableType) 1282 VisiblePosition previousLinePosition(const VisiblePosition& visiblePosition, Lay outUnit lineDirectionPoint, EditableType editableType)
1283 { 1283 {
1284 Position p = visiblePosition.deepEquivalent(); 1284 Position p = visiblePosition.deepEquivalent();
1285 Node* node = p.anchorNode(); 1285 Node* node = p.anchorNode();
1286 1286
1287 if (!node) 1287 if (!node)
1288 return VisiblePosition(); 1288 return VisiblePosition();
1289 1289
(...skipping 2060 matching lines...) Expand 10 before | Expand all | Expand 10 after
3350 { 3350 {
3351 return previousPositionOfAlgorithm<EditingStrategy>(visiblePosition, rule); 3351 return previousPositionOfAlgorithm<EditingStrategy>(visiblePosition, rule);
3352 } 3352 }
3353 3353
3354 VisiblePositionInComposedTree previousPositionOf(const VisiblePositionInComposed Tree& visiblePosition, EditingBoundaryCrossingRule rule) 3354 VisiblePositionInComposedTree previousPositionOf(const VisiblePositionInComposed Tree& visiblePosition, EditingBoundaryCrossingRule rule)
3355 { 3355 {
3356 return previousPositionOfAlgorithm<EditingInComposedTreeStrategy>(visiblePos ition, rule); 3356 return previousPositionOfAlgorithm<EditingInComposedTreeStrategy>(visiblePos ition, rule);
3357 } 3357 }
3358 3358
3359 } // namespace blink 3359 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698