Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
* Configurations/FeatureDefines.xcconfig:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Parsed and populated apple-touch-icon url to FrameLoaderClient.
Changed favicon to be a type of icon.
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* dom/Document.cpp:
(WebCore::Document::iconURL):
(WebCore::Document::setIconURL):
* dom/Document.h:
* dom/IconURL.cpp: Added.
(WebCore::toIconIndex):
* dom/IconURL.h: Added.
(WebCore::IconURL::IconURL):
* features.pri:
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::tokenizeRelAttribute):
(WebCore::HTMLLinkElement::process):
(WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
* html/HTMLLinkElement.h:
(WebCore::HTMLLinkElement::RelAttribute::RelAttribute):
(WebCore::HTMLLinkElement::isEnabledViaScript):
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::HTMLNames::PreloadTask::relAttributeIsStyleSheet):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::iconURL):
(WebCore::DocumentLoader::setIconURL):
* loader/DocumentLoader.h:
* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::dispatchDidChangeIcons):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::iconURL):
(WebCore::FrameLoader::iconURLs):
(WebCore::FrameLoader::fillIconURL):
(WebCore::FrameLoader::getDefaultIconURL):
(WebCore::FrameLoader::setIconURL):
(WebCore::FrameLoader::didChangeIcons):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respected the change of FrameLoaderClient.
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
* src/FrameLoaderClientImpl.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::dispatchDidChangeIcons):
* WebCoreSupport/FrameLoaderClientEfl.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchDidChangeIcons):
* WebCoreSupport/FrameLoaderClientGtk.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* Configurations/FeatureDefines.xcconfig:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidChangeIcons):
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::dispatchDidChangeIcons):
* WebCoreSupport/FrameLoaderClientQt.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::dispatchDidChangeIcons):
* WebCoreSupport/WebFrameLoaderClient.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* WebCoreSupport/FrameLoaderClientWinCE.cpp:
(WebKit::FrameLoaderClientWinCE::dispatchDidChangeIcons):
* WebCoreSupport/FrameLoaderClientWinCE.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respect the interface change in FrameLoaderClient.
* WebKitSupport/FrameLoaderClientWx.cpp:
(WebCore::FrameLoaderClientWx::dispatchDidChangeIcons):
* WebKitSupport/FrameLoaderClientWx.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Respected the change of FrameLoaderClient.
Added WebIconURL and WebIconType responding the new IconURL and IconType.
Supported to get the multiple icon urls.
* Configurations/FeatureDefines.xcconfig:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidChangeIcons):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
2011-05-04 Tao Bai <michaelbai@chromium.org>
Reviewed by David Kilzer.
Populate touch-icon url to FrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=59143
Disable touch icon by default.
* Scripts/build-webkit:
Canonical link: https://commits.webkit.org/75470@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85785 268f45cc-cd09-0410-ab3c-d52691b4dbfc- Loading branch information
1 parent
d7cc1bd
commit d9088689e4cb9aab1b89df2720171b82f5d94924
Showing
57 changed files
with
578 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -569,6 +569,7 @@ SET(WebCore_SOURCES | ||
| dom/EventQueue.cpp | ||
| dom/ExceptionBase.cpp | ||
| dom/ExceptionCode.cpp | ||
| dom/IconURL.cpp | ||
| dom/InputElement.cpp | ||
| dom/KeyboardEvent.cpp | ||
| dom/MessageChannel.cpp | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -492,6 +492,7 @@ SOURCES += \ | ||
| dom/EventQueue.cpp \ | ||
| dom/ExceptionBase.cpp \ | ||
| dom/ExceptionCode.cpp \ | ||
| dom/IconURL.cpp \ | ||
| dom/InputElement.cpp \ | ||
| dom/KeyboardEvent.cpp \ | ||
| dom/MessageChannel.cpp \ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright (C) 2011 Google Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google Inc. nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include "IconURL.h" | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| size_t toIconIndex(IconType type) | ||
| { | ||
| size_t index = 0; | ||
| switch (type) { | ||
| case Favicon: | ||
| index = 0; | ||
| break; | ||
| #if ENABLE(TOUCH_ICON_LOADING) | ||
| case TouchPrecomposedIcon: | ||
| index = 1; | ||
| break; | ||
| case TouchIcon: | ||
| index = 2; | ||
| break; | ||
| #endif | ||
| default: | ||
| ASSERT_NOT_REACHED(); | ||
| } | ||
| return index; | ||
| } | ||
|
|
||
| } | ||
|
|
Oops, something went wrong.