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

Side by Side Diff: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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) 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 Node* sibling = NodeTraversal::nextSkippingChildren(node); 735 Node* sibling = NodeTraversal::nextSkippingChildren(node);
736 for (Node* descendent = node.firstChild(); descendent && descendent != sibli ng; descendent = NodeTraversal::next(*descendent)) { 736 for (Node* descendent = node.firstChild(); descendent && descendent != sibli ng; descendent = NodeTraversal::next(*descendent)) {
737 if (!descendent->hasEditableStyle()) 737 if (!descendent->hasEditableStyle())
738 return true; 738 return true;
739 } 739 }
740 740
741 return false; 741 return false;
742 } 742 }
743 743
744 class InlineRunToApplyStyle { 744 class InlineRunToApplyStyle {
745 ALLOW_ONLY_INLINE_ALLOCATION(); 745 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
746 public: 746 public:
747 InlineRunToApplyStyle(Node* start, Node* end, Node* pastEndNode) 747 InlineRunToApplyStyle(Node* start, Node* end, Node* pastEndNode)
748 : start(start) 748 : start(start)
749 , end(end) 749 , end(end)
750 , pastEndNode(pastEndNode) 750 , pastEndNode(pastEndNode)
751 { 751 {
752 ASSERT(start->parentNode() == end->parentNode()); 752 ASSERT(start->parentNode() == end->parentNode());
753 } 753 }
754 754
755 bool startAndEndAreStillInDocument() 755 bool startAndEndAreStillInDocument()
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 DEFINE_TRACE(ApplyStyleCommand) 1594 DEFINE_TRACE(ApplyStyleCommand)
1595 { 1595 {
1596 visitor->trace(m_style); 1596 visitor->trace(m_style);
1597 visitor->trace(m_start); 1597 visitor->trace(m_start);
1598 visitor->trace(m_end); 1598 visitor->trace(m_end);
1599 visitor->trace(m_styledInlineElement); 1599 visitor->trace(m_styledInlineElement);
1600 CompositeEditCommand::trace(visitor); 1600 CompositeEditCommand::trace(visitor);
1601 } 1601 }
1602 1602
1603 } 1603 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698