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

Side by Side Diff: Source/WebCore/rendering/InlineBox.h

Issue 10970020: Merge 129144 - Prevent reading stale data from InlineTextBoxes (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | Source/WebCore/rendering/InlineTextBox.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) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 unsigned char bidiLevel() const { return m_bitfields.bidiEmbeddingLevel(); } 255 unsigned char bidiLevel() const { return m_bitfields.bidiEmbeddingLevel(); }
256 void setBidiLevel(unsigned char level) { m_bitfields.setBidiEmbeddingLevel(l evel); } 256 void setBidiLevel(unsigned char level) { m_bitfields.setBidiEmbeddingLevel(l evel); }
257 TextDirection direction() const { return bidiLevel() % 2 ? RTL : LTR; } 257 TextDirection direction() const { return bidiLevel() % 2 ? RTL : LTR; }
258 bool isLeftToRightDirection() const { return direction() == LTR; } 258 bool isLeftToRightDirection() const { return direction() == LTR; }
259 int caretLeftmostOffset() const { return isLeftToRightDirection() ? caretMin Offset() : caretMaxOffset(); } 259 int caretLeftmostOffset() const { return isLeftToRightDirection() ? caretMin Offset() : caretMaxOffset(); }
260 int caretRightmostOffset() const { return isLeftToRightDirection() ? caretMa xOffset() : caretMinOffset(); } 260 int caretRightmostOffset() const { return isLeftToRightDirection() ? caretMa xOffset() : caretMinOffset(); }
261 261
262 virtual void clearTruncation() { } 262 virtual void clearTruncation() { }
263 263
264 bool isDirty() const { return m_bitfields.dirty(); } 264 bool isDirty() const { return m_bitfields.dirty(); }
265 void markDirty(bool dirty = true) { m_bitfields.setDirty(dirty); } 265 virtual void markDirty(bool dirty = true) { m_bitfields.setDirty(dirty); }
266 266
267 virtual void dirtyLineBoxes(); 267 virtual void dirtyLineBoxes();
268 268
269 virtual RenderObject::SelectionState selectionState(); 269 virtual RenderObject::SelectionState selectionState();
270 270
271 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const; 271 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const;
272 // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system. 272 // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system.
273 virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibl eRightEdge, float ellipsisWidth, float &truncatedWidth, bool&); 273 virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibl eRightEdge, float ellipsisWidth, float &truncatedWidth, bool&);
274 274
275 #ifndef NDEBUG 275 #ifndef NDEBUG
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 436
437 } // namespace WebCore 437 } // namespace WebCore
438 438
439 #ifndef NDEBUG 439 #ifndef NDEBUG
440 // Outside the WebCore namespace for ease of invocation from gdb. 440 // Outside the WebCore namespace for ease of invocation from gdb.
441 void showTree(const WebCore::InlineBox*); 441 void showTree(const WebCore::InlineBox*);
442 void showLineTree(const WebCore::InlineBox*); 442 void showLineTree(const WebCore::InlineBox*);
443 #endif 443 #endif
444 444
445 #endif // InlineBox_h 445 #endif // InlineBox_h
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/rendering/InlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698