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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 setConsumesSubtreeChangeNotification(); 46 setConsumesSubtreeChangeNotification();
47 registerSubtreeChangeListenerOnDescendants(true); 47 registerSubtreeChangeListenerOnDescendants(true);
48 } 48 }
49 49
50 void LayoutListItem::styleDidChange(StyleDifference diff, 50 void LayoutListItem::styleDidChange(StyleDifference diff,
51 const ComputedStyle* oldStyle) { 51 const ComputedStyle* oldStyle) {
52 LayoutBlockFlow::styleDidChange(diff, oldStyle); 52 LayoutBlockFlow::styleDidChange(diff, oldStyle);
53 53
54 StyleImage* currentImage = style()->listStyleImage(); 54 StyleImage* currentImage = style()->listStyleImage();
55 if (style()->listStyleType() != EListStyleType::None || 55 if (style()->listStyleType() != EListStyleType::kNone ||
56 (currentImage && !currentImage->errorOccurred())) { 56 (currentImage && !currentImage->errorOccurred())) {
57 if (!m_marker) 57 if (!m_marker)
58 m_marker = LayoutListMarker::createAnonymous(this); 58 m_marker = LayoutListMarker::createAnonymous(this);
59 m_marker->listItemStyleDidChange(); 59 m_marker->listItemStyleDidChange();
60 notifyOfSubtreeChange(); 60 notifyOfSubtreeChange();
61 } else if (m_marker) { 61 } else if (m_marker) {
62 m_marker->destroy(); 62 m_marker->destroy();
63 m_marker = nullptr; 63 m_marker = nullptr;
64 } 64 }
65 65
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 // assume that all the following ones have too. 540 // assume that all the following ones have too.
541 // This gives us the opportunity to stop here and avoid 541 // This gives us the opportunity to stop here and avoid
542 // marking the same nodes again. 542 // marking the same nodes again.
543 break; 543 break;
544 } 544 }
545 item->updateValue(); 545 item->updateValue();
546 } 546 }
547 } 547 }
548 548
549 } // namespace blink 549 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutInline.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698