| 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) 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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All |
| 7 * rights reserved. | 7 * rights reserved. |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
| 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| (...skipping 5430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5441 first_touch_icon = new_url; | 5441 first_touch_icon = new_url; |
| 5442 } else if (link_element->GetIconType() == kTouchPrecomposedIcon) { | 5442 } else if (link_element->GetIconType() == kTouchPrecomposedIcon) { |
| 5443 if (first_touch_precomposed_icon.icon_type_ != kInvalidIcon) | 5443 if (first_touch_precomposed_icon.icon_type_ != kInvalidIcon) |
| 5444 secondary_icons.push_back(first_touch_precomposed_icon); | 5444 secondary_icons.push_back(first_touch_precomposed_icon); |
| 5445 first_touch_precomposed_icon = new_url; | 5445 first_touch_precomposed_icon = new_url; |
| 5446 } else { | 5446 } else { |
| 5447 NOTREACHED(); | 5447 NOTREACHED(); |
| 5448 } | 5448 } |
| 5449 } | 5449 } |
| 5450 | 5450 |
| 5451 Vector<IconURL> icon_ur_ls; | 5451 Vector<IconURL> icon_urls; |
| 5452 if (first_favicon.icon_type_ != kInvalidIcon) | 5452 if (first_favicon.icon_type_ != kInvalidIcon) |
| 5453 icon_ur_ls.push_back(first_favicon); | 5453 icon_urls.push_back(first_favicon); |
| 5454 else if (url_.ProtocolIsInHTTPFamily() && icon_types_mask & kFavicon) | 5454 else if (url_.ProtocolIsInHTTPFamily() && icon_types_mask & kFavicon) |
| 5455 icon_ur_ls.push_back(IconURL::DefaultFavicon(url_)); | 5455 icon_urls.push_back(IconURL::DefaultFavicon(url_)); |
| 5456 | 5456 |
| 5457 if (first_touch_icon.icon_type_ != kInvalidIcon) | 5457 if (first_touch_icon.icon_type_ != kInvalidIcon) |
| 5458 icon_ur_ls.push_back(first_touch_icon); | 5458 icon_urls.push_back(first_touch_icon); |
| 5459 if (first_touch_precomposed_icon.icon_type_ != kInvalidIcon) | 5459 if (first_touch_precomposed_icon.icon_type_ != kInvalidIcon) |
| 5460 icon_ur_ls.push_back(first_touch_precomposed_icon); | 5460 icon_urls.push_back(first_touch_precomposed_icon); |
| 5461 for (int i = secondary_icons.size() - 1; i >= 0; --i) | 5461 for (int i = secondary_icons.size() - 1; i >= 0; --i) |
| 5462 icon_ur_ls.push_back(secondary_icons[i]); | 5462 icon_urls.push_back(secondary_icons[i]); |
| 5463 return icon_ur_ls; | 5463 return icon_urls; |
| 5464 } | 5464 } |
| 5465 | 5465 |
| 5466 Color Document::ThemeColor() const { | 5466 Color Document::ThemeColor() const { |
| 5467 auto root_element = documentElement(); | 5467 auto root_element = documentElement(); |
| 5468 if (!root_element) | 5468 if (!root_element) |
| 5469 return Color(); | 5469 return Color(); |
| 5470 for (HTMLMetaElement& meta_element : | 5470 for (HTMLMetaElement& meta_element : |
| 5471 Traversal<HTMLMetaElement>::DescendantsOf(*root_element)) { | 5471 Traversal<HTMLMetaElement>::DescendantsOf(*root_element)) { |
| 5472 Color color = Color::kTransparent; | 5472 Color color = Color::kTransparent; |
| 5473 if (DeprecatedEqualIgnoringCase(meta_element.GetName(), "theme-color") && | 5473 if (DeprecatedEqualIgnoringCase(meta_element.GetName(), "theme-color") && |
| (...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6664 } | 6664 } |
| 6665 | 6665 |
| 6666 void showLiveDocumentInstances() { | 6666 void showLiveDocumentInstances() { |
| 6667 WeakDocumentSet& set = liveDocumentSet(); | 6667 WeakDocumentSet& set = liveDocumentSet(); |
| 6668 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 6668 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
| 6669 for (blink::Document* document : set) | 6669 for (blink::Document* document : set) |
| 6670 fprintf(stderr, "- Document %p URL: %s\n", document, | 6670 fprintf(stderr, "- Document %p URL: %s\n", document, |
| 6671 document->Url().GetString().Utf8().Data()); | 6671 document->Url().GetString().Utf8().Data()); |
| 6672 } | 6672 } |
| 6673 #endif | 6673 #endif |
| OLD | NEW |