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

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

Issue 2469873002: [ImageResource 4] Split ImageResource into Resource and Image parts (Closed)
Patch Set: style Created 4 years 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 6 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
7 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 7 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIB. If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #include "core/layout/LayoutListMarker.h" 26 #include "core/layout/LayoutListMarker.h"
27 27
28 #include "core/fetch/ImageResource.h"
29 #include "core/layout/LayoutAnalyzer.h" 28 #include "core/layout/LayoutAnalyzer.h"
30 #include "core/layout/LayoutListItem.h" 29 #include "core/layout/LayoutListItem.h"
31 #include "core/layout/ListMarkerText.h" 30 #include "core/layout/ListMarkerText.h"
32 #include "core/layout/api/LineLayoutBlockFlow.h" 31 #include "core/layout/api/LineLayoutBlockFlow.h"
33 #include "core/paint/ListMarkerPainter.h" 32 #include "core/paint/ListMarkerPainter.h"
34 #include "platform/fonts/Font.h" 33 #include "platform/fonts/Font.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 const int cMarkerPaddingPx = 7; 37 const int cMarkerPaddingPx = 7;
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 if (style()) { 485 if (style()) {
487 // Reuse the current margins. Otherwise resetting the margins to initial 486 // Reuse the current margins. Otherwise resetting the margins to initial
488 // values would trigger unnecessary layout. 487 // values would trigger unnecessary layout.
489 newStyle->setMarginStart(style()->marginStart()); 488 newStyle->setMarginStart(style()->marginStart());
490 newStyle->setMarginEnd(style()->marginRight()); 489 newStyle->setMarginEnd(style()->marginRight());
491 } 490 }
492 setStyle(newStyle.release()); 491 setStyle(newStyle.release());
493 } 492 }
494 493
495 } // namespace blink 494 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698