third_party/WebKit/Source/core/html/HTMLBodyElement.cpp - Issue 1399853005: Changed CSSColorValue to return a Color

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

Issue 1399853005: Changed CSSColorValue to return a Color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_color

Patch Set: Fix for ManifestParser Created 5 years, 2 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/EditingStyle.cpp ('k') | third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp » ('j') | third_party/WebKit/Source/web/WebCSSParser.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 * (C) 2000 Simon Hausmann (hausmann@kde.org)	4 * (C) 2000 Simon Hausmann (hausmann@kde.org)

5 * (C) 2001 Dirk Mueller (mueller@kde.org)	5 * (C) 2001 Dirk Mueller (mueller@kde.org)

6 * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.	6 * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.

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 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 {	86 {

87 if (name == vlinkAttr \|\| name == alinkAttr \|\| name == linkAttr) {	87 if (name == vlinkAttr \|\| name == alinkAttr \|\| name == linkAttr) {

88 if (value.isNull()) {	88 if (value.isNull()) {

89 if (name == linkAttr)	89 if (name == linkAttr)

90 document().textLinkColors().resetLinkColor();	90 document().textLinkColors().resetLinkColor();

91 else if (name == vlinkAttr)	91 else if (name == vlinkAttr)

92 document().textLinkColors().resetVisitedLinkColor();	92 document().textLinkColors().resetVisitedLinkColor();

93 else	93 else

94 document().textLinkColors().resetActiveLinkColor();	94 document().textLinkColors().resetActiveLinkColor();

95 } else {	95 } else {

96 RGBA32 color;	96 Color color;

97 if (CSSParser::parseColor(color, value, !document().inQuirksMode())) {	97 if (CSSParser::parseColor(color, value, !document().inQuirksMode())) {

98 if (name == linkAttr)	98 if (name == linkAttr)

99 document().textLinkColors().setLinkColor(color);	99 document().textLinkColors().setLinkColor(color);

100 else if (name == vlinkAttr)	100 else if (name == vlinkAttr)

101 document().textLinkColors().setVisitedLinkColor(color);	101 document().textLinkColors().setVisitedLinkColor(color);

102 else	102 else

103 document().textLinkColors().setActiveLinkColor(color);	103 document().textLinkColors().setActiveLinkColor(color);

104 }	104 }

105 }	105 }

106	106

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187 }	187 }

188	188

189 bool HTMLBodyElement::supportsFocus() const	189 bool HTMLBodyElement::supportsFocus() const

190 {	190 {

191 // This override is needed because the inherited method bails if the parent is editable.	191 // This override is needed because the inherited method bails if the parent is editable.

192 // The <body> should be focusable even if <html> is editable.	192 // The <body> should be focusable even if <html> is editable.

193 return hasEditableStyle() \|\| HTMLElement::supportsFocus();	193 return hasEditableStyle() \|\| HTMLElement::supportsFocus();

194 }	194 }

195	195

196 } // namespace blink	196 } // namespace blink

OLD	NEW