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

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

Issue 2159373003: Cursor should respect text align in contenteditable with pseudo element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added testcase Created 4 years, 5 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, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 bool LayoutBlock::hasDragCaret() const 1599 bool LayoutBlock::hasDragCaret() const
1600 { 1600 {
1601 LocalFrame* frame = this->frame(); 1601 LocalFrame* frame = this->frame();
1602 DragCaretController& dragCaretController = frame->page()->dragCaretControlle r(); 1602 DragCaretController& dragCaretController = frame->page()->dragCaretControlle r();
1603 return dragCaretController.caretLayoutObject() == this && (dragCaretControll er.isContentEditable() || caretBrowsingEnabled(frame)); 1603 return dragCaretController.caretLayoutObject() == this && (dragCaretControll er.isContentEditable() || caretBrowsingEnabled(frame));
1604 } 1604 }
1605 1605
1606 LayoutRect LayoutBlock::localCaretRect(InlineBox* inlineBox, int caretOffset, La youtUnit* extraWidthToEndOfLine) 1606 LayoutRect LayoutBlock::localCaretRect(InlineBox* inlineBox, int caretOffset, La youtUnit* extraWidthToEndOfLine)
1607 { 1607 {
1608 // Do the normal calculation in most cases. 1608 // Do the normal calculation in most cases.
1609 if (firstChild() || isInlineBoxWrapperActuallyChild()) 1609 if ((firstChild() && !firstChild()->isPseudoElement()) || isInlineBoxWrapper ActuallyChild())
1610 return LayoutBox::localCaretRect(inlineBox, caretOffset, extraWidthToEnd OfLine); 1610 return LayoutBox::localCaretRect(inlineBox, caretOffset, extraWidthToEnd OfLine);
1611 1611
1612 LayoutRect caretRect = localCaretRectForEmptyElement(size().width(), textInd entOffset()); 1612 LayoutRect caretRect = localCaretRectForEmptyElement(size().width(), textInd entOffset());
1613 1613
1614 if (extraWidthToEndOfLine) 1614 if (extraWidthToEndOfLine)
1615 *extraWidthToEndOfLine = size().width() - caretRect.maxX(); 1615 *extraWidthToEndOfLine = size().width() - caretRect.maxX();
1616 1616
1617 return caretRect; 1617 return caretRect;
1618 } 1618 }
1619 1619
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1864 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) { 1864 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) {
1865 LayoutBox* currBox = *it; 1865 LayoutBox* currBox = *it;
1866 ASSERT(!currBox->needsLayout()); 1866 ASSERT(!currBox->needsLayout());
1867 } 1867 }
1868 } 1868 }
1869 } 1869 }
1870 1870
1871 #endif 1871 #endif
1872 1872
1873 } // namespace blink 1873 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698