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

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

Issue 2463573002: Problem: Blink list-item-position is inside for unstyled list items Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 1 month 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. 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 case Urdu: 391 case Urdu:
392 return ListStyleCategory::Language; 392 return ListStyleCategory::Language;
393 default: 393 default:
394 ASSERT_NOT_REACHED(); 394 ASSERT_NOT_REACHED();
395 return ListStyleCategory::Language; 395 return ListStyleCategory::Language;
396 } 396 }
397 } 397 }
398 398
399 bool LayoutListMarker::isInside() const 399 bool LayoutListMarker::isInside() const
400 { 400 {
401 return m_listItem->notInList() || style()->listStylePosition() == ListStyleP ositionInside; 401 return style()->listStylePosition() == ListStylePositionInside;
402 } 402 }
403 403
404 IntRect LayoutListMarker::getRelativeMarkerRect() const 404 IntRect LayoutListMarker::getRelativeMarkerRect() const
405 { 405 {
406 if (isImage()) { 406 if (isImage()) {
407 IntSize imageSize = flooredIntSize(imageBulletSize()); 407 IntSize imageSize = flooredIntSize(imageBulletSize());
408 return IntRect(0, 0, imageSize.width(), imageSize.height()); 408 return IntRect(0, 0, imageSize.width(), imageSize.height());
409 } 409 }
410 410
411 IntRect relativeRect; 411 IntRect relativeRect;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 if (style()) { 452 if (style()) {
453 // Reuse the current margins. Otherwise resetting the margins to initial values 453 // Reuse the current margins. Otherwise resetting the margins to initial values
454 // would trigger unnecessary layout. 454 // would trigger unnecessary layout.
455 newStyle->setMarginStart(style()->marginStart()); 455 newStyle->setMarginStart(style()->marginStart());
456 newStyle->setMarginEnd(style()->marginRight()); 456 newStyle->setMarginEnd(style()->marginRight());
457 } 457 }
458 setStyle(newStyle.release()); 458 setStyle(newStyle.release());
459 } 459 }
460 460
461 } // namespace blink 461 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutListItem.cpp ('k') | third_party/WebKit/Source/core/layout/api/LayoutLIItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698