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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLElement.cpp

Issue 2233333002: Made StylePropertySet::setProperty take a const CSSValue& instead of ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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) 2004-2008, 2013, 2014 Apple Inc. All rights reserved. 4 * Copyright (C) 2004-2008, 2013, 2014 Apple Inc. All rights reserved.
5 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 5 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
6 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 6 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
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 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 989
990 return success; 990 return success;
991 } 991 }
992 992
993 void HTMLElement::addHTMLColorToStyle(MutableStylePropertySet* style, CSSPropert yID propertyID, const String& attributeValue) 993 void HTMLElement::addHTMLColorToStyle(MutableStylePropertySet* style, CSSPropert yID propertyID, const String& attributeValue)
994 { 994 {
995 Color parsedColor; 995 Color parsedColor;
996 if (!parseColorWithLegacyRules(attributeValue, parsedColor)) 996 if (!parseColorWithLegacyRules(attributeValue, parsedColor))
997 return; 997 return;
998 998
999 style->setProperty(propertyID, CSSColorValue::create(parsedColor.rgb())); 999 style->setProperty(propertyID, *CSSColorValue::create(parsedColor.rgb()));
1000 } 1000 }
1001 1001
1002 bool HTMLElement::isInteractiveContent() const 1002 bool HTMLElement::isInteractiveContent() const
1003 { 1003 {
1004 return false; 1004 return false;
1005 } 1005 }
1006 1006
1007 HTMLMenuElement* HTMLElement::assignedContextMenu() const 1007 HTMLMenuElement* HTMLElement::assignedContextMenu() const
1008 { 1008 {
1009 if (HTMLMenuElement* menu = contextMenu()) 1009 if (HTMLMenuElement* menu = contextMenu())
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 #ifndef NDEBUG 1147 #ifndef NDEBUG
1148 1148
1149 // For use in the debugger 1149 // For use in the debugger
1150 void dumpInnerHTML(blink::HTMLElement*); 1150 void dumpInnerHTML(blink::HTMLElement*);
1151 1151
1152 void dumpInnerHTML(blink::HTMLElement* element) 1152 void dumpInnerHTML(blink::HTMLElement* element)
1153 { 1153 {
1154 printf("%s\n", element->innerHTML().ascii().data()); 1154 printf("%s\n", element->innerHTML().ascii().data());
1155 } 1155 }
1156 #endif 1156 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698