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

Side by Side Diff: WebCore/rendering/RenderListMarker.cpp

Issue 2158002: Merge 59950 - WebCore: Fix for <rdar://problem/8009118> Crash in WebCore::toA... (Closed) Base URL: svn://chrome-svn/chrome/branches/WebKit/375/
Patch Set: Created 10 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ASSERT(number > 0); 94 ASSERT(number > 0);
95 --numberShadow; 95 --numberShadow;
96 } else if (number < 0) { 96 } else if (number < 0) {
97 numberShadow = -number; 97 numberShadow = -number;
98 isNegativeNumber = true; 98 isNegativeNumber = true;
99 } 99 }
100 letters[lettersSize - 1] = sequence[numberShadow % sequenceSize]; 100 letters[lettersSize - 1] = sequence[numberShadow % sequenceSize];
101 int length = 1; 101 int length = 1;
102 102
103 if (type == AlphabeticSequence) { 103 if (type == AlphabeticSequence) {
104 while ((numberShadow /= sequenceSize) > 0) 104 while ((numberShadow /= sequenceSize) > 0) {
105 letters[lettersSize - ++length] = sequence[numberShadow % sequenceSi ze - 1]; 105 --numberShadow;
106 letters[lettersSize - ++length] = sequence[numberShadow % sequenceSi ze];
107 }
106 } else { 108 } else {
107 while ((numberShadow /= sequenceSize) > 0) 109 while ((numberShadow /= sequenceSize) > 0)
108 letters[lettersSize - ++length] = sequence[numberShadow % sequenceSi ze]; 110 letters[lettersSize - ++length] = sequence[numberShadow % sequenceSi ze];
109 } 111 }
110 if (isNegativeNumber) 112 if (isNegativeNumber)
111 letters[lettersSize - ++length] = hyphenMinus; 113 letters[lettersSize - ++length] = hyphenMinus;
112 114
113 ASSERT(length <= lettersSize); 115 ASSERT(length <= lettersSize);
114 return String(&letters[lettersSize - length], length); 116 return String(&letters[lettersSize - length], length);
115 } 117 }
(...skipping 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 1513
1512 if (clipToVisibleContent) 1514 if (clipToVisibleContent)
1513 computeRectForRepaint(repaintContainer, rect); 1515 computeRectForRepaint(repaintContainer, rect);
1514 else 1516 else
1515 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing BoundingBox(); 1517 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing BoundingBox();
1516 1518
1517 return rect; 1519 return rect;
1518 } 1520 }
1519 1521
1520 } // namespace WebCore 1522 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698