| Index: Source/core/editing/VisibleUnits.cpp
|
| diff --git a/Source/core/editing/VisibleUnits.cpp b/Source/core/editing/VisibleUnits.cpp
|
| index dbb47bf455ee7e553e3d240aedcd034f04c3115a..4df3f7b9e4dafce8bc47e2f63c0e1216496113fb 100644
|
| --- a/Source/core/editing/VisibleUnits.cpp
|
| +++ b/Source/core/editing/VisibleUnits.cpp
|
| @@ -1288,19 +1288,15 @@ VisiblePosition nextParagraphPosition(const VisiblePosition& p, int x)
|
| VisiblePosition startOfBlock(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
|
| {
|
| Position position = visiblePosition.deepEquivalent();
|
| - Node* startBlock;
|
| - if (!position.containerNode() || !(startBlock = enclosingBlock(position.containerNode(), rule)))
|
| - return VisiblePosition();
|
| - return VisiblePosition(firstPositionInNode(startBlock));
|
| + Node* startBlock = position.containerNode() ? enclosingBlock(position.containerNode(), rule) : 0;
|
| + return startBlock ? VisiblePosition(firstPositionInNode(startBlock)) : VisiblePosition();
|
| }
|
|
|
| VisiblePosition endOfBlock(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
|
| {
|
| Position position = visiblePosition.deepEquivalent();
|
| - Node* endBlock;
|
| - if (!position.containerNode() || !(endBlock = enclosingBlock(position.containerNode(), rule)))
|
| - return VisiblePosition();
|
| - return VisiblePosition(lastPositionInNode(endBlock));
|
| + Node* endBlock = position.containerNode() ? enclosingBlock(position.containerNode(), rule) : 0;
|
| + return endBlock ? VisiblePosition(lastPositionInNode(endBlock)) : VisiblePosition();
|
| }
|
|
|
| bool inSameBlock(const VisiblePosition &a, const VisiblePosition &b)
|
|
|