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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.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
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 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 4659 matching lines...) Expand 10 before | Expand all | Expand 10 after
4670 if (firstTouchPrecomposedIcon.m_iconType != InvalidIcon) 4670 if (firstTouchPrecomposedIcon.m_iconType != InvalidIcon)
4671 iconURLs.append(firstTouchPrecomposedIcon); 4671 iconURLs.append(firstTouchPrecomposedIcon);
4672 for (int i = secondaryIcons.size() - 1; i >= 0; --i) 4672 for (int i = secondaryIcons.size() - 1; i >= 0; --i)
4673 iconURLs.append(secondaryIcons[i]); 4673 iconURLs.append(secondaryIcons[i]);
4674 return iconURLs; 4674 return iconURLs;
4675 } 4675 }
4676 4676
4677 Color Document::themeColor() const 4677 Color Document::themeColor() const
4678 { 4678 {
4679 for (HTMLMetaElement* metaElement = head() ? Traversal<HTMLMetaElement>::fir stChild(*head()) : 0; metaElement; metaElement = Traversal<HTMLMetaElement>::nex tSibling(*metaElement)) { 4679 for (HTMLMetaElement* metaElement = head() ? Traversal<HTMLMetaElement>::fir stChild(*head()) : 0; metaElement; metaElement = Traversal<HTMLMetaElement>::nex tSibling(*metaElement)) {
4680 RGBA32 rgb = Color::transparent; 4680 Color color = Color::transparent;
4681 if (equalIgnoringCase(metaElement->name(), "theme-color") && CSSParser:: parseColor(rgb, metaElement->content().string().stripWhiteSpace(), true)) 4681 if (equalIgnoringCase(metaElement->name(), "theme-color") && CSSParser:: parseColor(color, metaElement->content().string().stripWhiteSpace(), true))
4682 return Color(rgb); 4682 return color;
4683 } 4683 }
4684 return Color(); 4684 return Color();
4685 } 4685 }
4686 4686
4687 HTMLLinkElement* Document::linkManifest() const 4687 HTMLLinkElement* Document::linkManifest() const
4688 { 4688 {
4689 HTMLHeadElement* head = this->head(); 4689 HTMLHeadElement* head = this->head();
4690 if (!head) 4690 if (!head)
4691 return 0; 4691 return 0;
4692 4692
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after
5825 #ifndef NDEBUG 5825 #ifndef NDEBUG
5826 using namespace blink; 5826 using namespace blink;
5827 void showLiveDocumentInstances() 5827 void showLiveDocumentInstances()
5828 { 5828 {
5829 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5829 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5830 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5830 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5831 for (Document* document : set) 5831 for (Document* document : set)
5832 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5832 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5833 } 5833 }
5834 #endif 5834 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698