Changeset 85785 in webkit


Ignore:
Timestamp:
May 4, 2011 2:02:54 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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:
Location:
trunk
Files:
2 added
55 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r85771 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102011-05-03  Geoffrey Garen  <ggaren@apple.com>
    211
  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r85340 r85785  
    118118ENABLE_MEDIA_STATISTICS = ;
    119119
     120ENABLE_TOUCH_ICON_LOADING = ;
     121
    120122ENABLE_WEB_AUDIO = ;
    121123
     
    132134ENABLE_XSLT = ENABLE_XSLT;
    133135
    134 FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     136FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
  • trunk/Source/WebCore/CMakeLists.txt

    r85745 r85785  
    570570    dom/ExceptionBase.cpp
    571571    dom/ExceptionCode.cpp
     572    dom/IconURL.cpp
    572573    dom/InputElement.cpp
    573574    dom/KeyboardEvent.cpp
  • trunk/Source/WebCore/ChangeLog

    r85781 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7       
     8        Parsed and populated apple-touch-icon url to FrameLoaderClient.
     9        Changed favicon to be a type of icon.
     10
     11        * CMakeLists.txt:
     12        * Configurations/FeatureDefines.xcconfig:
     13        * GNUmakefile.am:
     14        * GNUmakefile.list.am:
     15        * WebCore.gypi:
     16        * WebCore.vcproj/WebCore.vcproj:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * dom/Document.cpp:
     19        (WebCore::Document::iconURL):
     20        (WebCore::Document::setIconURL):
     21        * dom/Document.h:
     22        * dom/IconURL.cpp: Added.
     23        (WebCore::toIconIndex):
     24        * dom/IconURL.h: Added.
     25        (WebCore::IconURL::IconURL):
     26        * features.pri:
     27        * html/HTMLLinkElement.cpp:
     28        (WebCore::HTMLLinkElement::tokenizeRelAttribute):
     29        (WebCore::HTMLLinkElement::process):
     30        (WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
     31        * html/HTMLLinkElement.h:
     32        (WebCore::HTMLLinkElement::RelAttribute::RelAttribute):
     33        (WebCore::HTMLLinkElement::isEnabledViaScript):
     34        * html/parser/HTMLPreloadScanner.cpp:
     35        (WebCore::HTMLNames::PreloadTask::relAttributeIsStyleSheet):
     36        * loader/DocumentLoader.cpp:
     37        (WebCore::DocumentLoader::iconURL):
     38        (WebCore::DocumentLoader::setIconURL):
     39        * loader/DocumentLoader.h:
     40        * loader/EmptyClients.h:
     41        (WebCore::EmptyFrameLoaderClient::dispatchDidChangeIcons):
     42        * loader/FrameLoader.cpp:
     43        (WebCore::FrameLoader::iconURL):
     44        (WebCore::FrameLoader::iconURLs):
     45        (WebCore::FrameLoader::fillIconURL):
     46        (WebCore::FrameLoader::getDefaultIconURL):
     47        (WebCore::FrameLoader::setIconURL):
     48        (WebCore::FrameLoader::didChangeIcons):
     49        * loader/FrameLoader.h:
     50        * loader/FrameLoaderClient.h:
     51
    1522011-05-04  Chris Marrin  <cmarrin@apple.com>
    253
  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r85340 r85785  
    118118ENABLE_MEDIA_STATISTICS = ;
    119119
     120ENABLE_TOUCH_ICON_LOADING = ;
     121
    120122ENABLE_WEB_AUDIO = ;
    121123
     
    132134ENABLE_XSLT = ENABLE_XSLT;
    133135
    134 FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     136FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
  • trunk/Source/WebCore/GNUmakefile.am

    r85340 r85785  
    262262
    263263# ----
     264# Touch Icon Loading
     265# ----
     266if ENABLE_TOUCH_ICON_LOADING
     267FEATURE_DEFINES += ENABLE_TOUCH_ICON_LOADING=1
     268webcore_cppflags += -DENABLE_TOUCH_ICON_LOADING=1
     269else
     270webcore_cppflags += -DENABLE_TOUCH_ICON_LOADING=0
     271endif # END ENABLE_TOUCH_ICON_LOADING
     272
     273# ----
    264274# Speech Input API support
    265275# ----
  • trunk/Source/WebCore/GNUmakefile.list.am

    r85745 r85785  
    11521152        Source/WebCore/dom/FragmentScriptingPermission.h \
    11531153        Source/WebCore/dom/IgnoreDestructiveWriteCountIncrementer.h \
     1154        Source/WebCore/dom/IconURL.cpp \
     1155        Source/WebCore/dom/IconURL.h \
    11541156        Source/WebCore/dom/InputElement.cpp \
    11551157        Source/WebCore/dom/InputElement.h \
  • trunk/Source/WebCore/WebCore.gypi

    r85745 r85785  
    24712471            'dom/HashChangeEvent.h',
    24722472            'dom/IgnoreDestructiveWriteCountIncrementer.h',
     2473            'dom/IconURL.cpp',
     2474            'dom/IconURL.h',
    24732475            'dom/InputElement.cpp',
    24742476            'dom/KeyboardEvent.cpp',
  • trunk/Source/WebCore/WebCore.pro

    r85774 r85785  
    493493    dom/ExceptionBase.cpp \
    494494    dom/ExceptionCode.cpp \
     495    dom/IconURL.cpp \
    495496    dom/InputElement.cpp \
    496497    dom/KeyboardEvent.cpp \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r85745 r85785  
    4450344503                        </File>
    4450444504                        <File
     44505                                RelativePath="..\dom\IconURL.cpp"
     44506                                >
     44507                                <FileConfiguration
     44508                                        Name="Debug|Win32"
     44509                                        ExcludedFromBuild="true"
     44510                                        >
     44511                                        <Tool
     44512                                                Name="VCCLCompilerTool"
     44513                                        />
     44514                                </FileConfiguration>
     44515                                <FileConfiguration
     44516                                        Name="Release|Win32"
     44517                                        ExcludedFromBuild="true"
     44518                                        >
     44519                                        <Tool
     44520                                                Name="VCCLCompilerTool"
     44521                                        />
     44522                                </FileConfiguration>
     44523                                <FileConfiguration
     44524                                        Name="Debug_Cairo_CFLite|Win32"
     44525                                        ExcludedFromBuild="true"
     44526                                        >
     44527                                        <Tool
     44528                                                Name="VCCLCompilerTool"
     44529                                        />
     44530                                </FileConfiguration>
     44531                                <FileConfiguration
     44532                                        Name="Release_Cairo_CFLite|Win32"
     44533                                        ExcludedFromBuild="true"
     44534                                        >
     44535                                        <Tool
     44536                                                Name="VCCLCompilerTool"
     44537                                        />
     44538                                </FileConfiguration>
     44539                                <FileConfiguration
     44540                                        Name="Debug_All|Win32"
     44541                                        ExcludedFromBuild="true"
     44542                                        >
     44543                                        <Tool
     44544                                                Name="VCCLCompilerTool"
     44545                                        />
     44546                                </FileConfiguration>
     44547                                <FileConfiguration
     44548                                        Name="Production|Win32"
     44549                                        ExcludedFromBuild="true"
     44550                                        >
     44551                                        <Tool
     44552                                                Name="VCCLCompilerTool"
     44553                                        />
     44554                                </FileConfiguration>
     44555                        </File>
     44556                        <File
     44557                                RelativePath="..\dom\IconURL.h"
     44558                                >
     44559                        </File>
     44560                        <File
    4450544561                                RelativePath="..\dom\InputElement.cpp"
    4450644562                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r85745 r85785  
    971971                44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */; };
    972972                44A28AAF12DFB8BF00AE923B /* MathMLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAE12DFB8BF00AE923B /* MathMLNames.h */; };
     973                45099C411370A7800058D513 /* IconURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45099C401370A7800058D513 /* IconURL.cpp */; };
     974                45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
    973975                4614A1FE0B23A8D600446E1C /* copyCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 4614A1FD0B23A8D600446E1C /* copyCursor.png */; };
    974976                464EA2730B8A350B00A8E6E3 /* crossHairCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 464EA2710B8A350B00A8E6E3 /* crossHairCursor.png */; };
     
    74427444                44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLElementFactory.h; sourceTree = "<group>"; };
    74437445                44A28AAE12DFB8BF00AE923B /* MathMLNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLNames.h; sourceTree = "<group>"; };
     7446                45099C401370A7800058D513 /* IconURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IconURL.cpp; path = dom/IconURL.cpp; sourceTree = "<group>"; };
     7447                45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IconURL.h; path = dom/IconURL.h; sourceTree = "<group>"; };
    74447448                4614A1FD0B23A8D600446E1C /* copyCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = copyCursor.png; sourceTree = "<group>"; };
    74457449                464EA2710B8A350B00A8E6E3 /* crossHairCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = crossHairCursor.png; sourceTree = "<group>"; };
     
    1252812532                        isa = PBXGroup;
    1252912533                        children = (
     12534                                45099C401370A7800058D513 /* IconURL.cpp */,
     12535                                45BAC2AF1360BBAB005DA258 /* IconURL.h */,
    1253012536                                65C97AF208EA908800ACD273 /* config.h */,
    1253112537                                EDEC98020AED7E170059137F /* WebCorePrefix.h */,
     
    2271822724                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    2271922725                                977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */,
     22726                                45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */,
    2272022727                                B1E54594134629C10092A545 /* MediaStreamClient.h in Headers */,
    2272122728                                B1E54598134629C10092A545 /* MediaStreamController.h in Headers */,
     
    2538125388                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
    2538225389                                977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */,
     25390                                45099C411370A7800058D513 /* IconURL.cpp in Sources */,
    2538325391                                B1E54597134629C10092A545 /* MediaStreamController.cpp in Sources */,
    2538425392                                B1E54595134629C10092A545 /* MediaStreamFrameController.cpp in Sources */,
  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r83256 r85785  
    7676#include "ExceptionBase.cpp"
    7777#include "ExceptionCode.cpp"
     78#include "IconURL.cpp"
    7879#include "InputElement.cpp"
    7980#include "KeyboardEvent.cpp"
  • trunk/Source/WebCore/dom/Document.cpp

    r85746 r85785  
    43964396}
    43974397
    4398 void Document::setIconURL(const String& iconURL, const String& type)
    4399 {
    4400     // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "type"
    4401     if (m_iconURL.isEmpty())
    4402         m_iconURL = iconURL;
    4403     else if (!type.isEmpty())
    4404         m_iconURL = iconURL;
     4398IconURL Document::iconURL(IconType iconType) const
     4399{
     4400    return m_iconURLs[toIconIndex(iconType)];
     4401}
     4402
     4403void Document::setIconURL(const String& url, const String& mimeType, IconType iconType)
     4404{
     4405    // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "mimeType"
     4406    IconURL newURL(KURL(ParsedURLString, url), iconType);
     4407    if (!iconURL(iconType).m_iconURL.isEmpty())
     4408        setIconURL(newURL);
     4409    else if (!mimeType.isEmpty())
     4410        setIconURL(newURL);
    44054411    if (Frame* f = frame())
    4406         f->loader()->setIconURL(m_iconURL);
     4412        f->loader()->setIconURL(newURL);
     4413}
     4414
     4415void Document::setIconURL(const IconURL& iconURL)
     4416{
     4417    m_iconURLs[toIconIndex(iconURL.m_iconType)] = iconURL;
    44074418}
    44084419
  • trunk/Source/WebCore/dom/Document.h

    r85680 r85785  
    3434#include "DOMTimeStamp.h"
    3535#include "DocumentTiming.h"
     36#include "IconURL.h"
    3637#include "QualifiedName.h"
    3738#include "ScriptExecutionContext.h"
     
    921922    void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
    922923
    923     const String& iconURL() const { return m_iconURL; }
    924     void setIconURL(const String& iconURL, const String& type);
     924    IconURL iconURL(IconType) const;
     925    void setIconURL(const String&, const String&, IconType);
     926    void setIconURL(const IconURL&);
    925927
    926928    void setUseSecureKeyboardEntryWhenActive(bool);
     
    13301332    bool m_createRenderers;
    13311333    bool m_inPageCache;
    1332     String m_iconURL;
    1333    
     1334    IconURL m_iconURLs[ICON_COUNT];
     1335
    13341336    HashSet<Element*> m_documentActivationCallbackElements;
    13351337    HashSet<Element*> m_mediaVolumeCallbackElements;
  • trunk/Source/WebCore/features.pri

    r85340 r85785  
    7676!contains(DEFINES, ENABLE_MEDIA_STATISTICS=.): DEFINES += ENABLE_MEDIA_STATISTICS=0
    7777!contains(DEFINES, ENABLE_VIDEO_TRACK=.): DEFINES += ENABLE_VIDEO_TRACK=0
     78!contains(DEFINES, ENABLE_TOUCH_ICON_LOADING=.): DEFINES += ENABLE_TOUCH_ICON_LOADING=0
    7879!contains(DEFINES, ENABLE_ANIMATION_API=.): DEFINES += ENABLE_ANIMATION_API=0
    7980
  • trunk/Source/WebCore/html/HTMLLinkElement.cpp

    r85395 r85785  
    161161{
    162162    relAttribute.m_isStyleSheet = false;
    163     relAttribute.m_isIcon = false;
     163    relAttribute.m_iconType = InvalidIcon;
    164164    relAttribute.m_isAlternate = false;
    165165    relAttribute.m_isDNSPrefetch = false;
     
    171171        relAttribute.m_isStyleSheet = true;
    172172    else if (equalIgnoringCase(rel, "icon") || equalIgnoringCase(rel, "shortcut icon"))
    173         relAttribute.m_isIcon = true;
     173        relAttribute.m_iconType = Favicon;
     174#if ENABLE(TOUCH_ICON_LOADING)
     175    else if (equalIgnoringCase(rel, "apple-touch-icon"))
     176        relAttribute.m_iconType = TouchIcon;
     177    else if (equalIgnoringCase(rel, "apple-touch-icon-precomposed"))
     178        relAttribute.m_iconType = TouchPrecomposedIcon;
     179#endif
    174180    else if (equalIgnoringCase(rel, "dns-prefetch"))
    175181        relAttribute.m_isDNSPrefetch = true;
     
    190196                relAttribute.m_isAlternate = true;
    191197            else if (equalIgnoringCase(*it, "icon"))
    192                 relAttribute.m_isIcon = true;
     198                relAttribute.m_iconType = Favicon;
     199#if ENABLE(TOUCH_ICON_LOADING)
     200            else if (equalIgnoringCase(*it, "apple-touch-icon"))
     201                relAttribute.m_iconType = TouchIcon;
     202            else if (equalIgnoringCase(*it, "apple-touch-icon-precomposed"))
     203                relAttribute.m_iconType = TouchPrecomposedIcon;
     204#endif
    193205#if ENABLE(LINK_PREFETCH)
    194206            else if (equalIgnoringCase(*it, "prefetch"))
     
    223235    // IE extension: location of small icon for locationbar / bookmarks
    224236    // We'll record this URL per document, even if we later only use it in top level frames
    225     if (m_relAttribute.m_isIcon && m_url.isValid() && !m_url.isEmpty()) {
     237    if (m_relAttribute.m_iconType != InvalidIcon && m_url.isValid() && !m_url.isEmpty()) {
    226238        if (!checkBeforeLoadEvent())
    227239            return;
    228         document()->setIconURL(m_url.string(), type);
     240        document()->setIconURL(m_url.string(), type, m_relAttribute.m_iconType);
    229241    }
    230242
     
    474486
    475487    // Favicons are handled by a special case in LegacyWebArchive::create()
    476     if (m_relAttribute.m_isIcon)
     488    if (m_relAttribute.m_iconType != InvalidIcon)
    477489        return;
    478490
  • trunk/Source/WebCore/html/HTMLLinkElement.h

    r84329 r85785  
    2828#include "CachedResourceHandle.h"
    2929#include "HTMLElement.h"
     30#include "IconURL.h"
    3031#include "Timer.h"
    3132
     
    4041    struct RelAttribute {
    4142        bool m_isStyleSheet;
    42         bool m_isIcon;
     43        IconType m_iconType;
    4344        bool m_isAlternate;
    4445        bool m_isDNSPrefetch;
     
    5051        RelAttribute()
    5152            : m_isStyleSheet(false)
    52             , m_isIcon(false)
     53            , m_iconType(InvalidIcon)
    5354            , m_isAlternate(false)
    5455            , m_isDNSPrefetch(false)
     
    7778    bool isDisabled() const { return m_disabledState == Disabled; }
    7879    bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; }
    79     bool isIcon() const { return m_relAttribute.m_isIcon; }
    8080    bool disabled() const;
    8181    void setDisabled(bool);
  • trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

    r82379 r85785  
    9696        HTMLLinkElement::RelAttribute rel;
    9797        HTMLLinkElement::tokenizeRelAttribute(attributeValue, rel);
    98         return rel.m_isStyleSheet && !rel.m_isAlternate && !rel.m_isIcon && !rel.m_isDNSPrefetch;
     98        return rel.m_isStyleSheet && !rel.m_isAlternate && rel.m_iconType == InvalidIcon && !rel.m_isDNSPrefetch;
    9999    }
    100100
  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r84538 r85785  
    662662}
    663663
    664 void DocumentLoader::setIconURL(const String& iconURL)
    665 {
    666     if (iconURL.isEmpty())
    667         return;
    668 
    669     if (m_pageIconURL != iconURL) {
    670         m_pageIconURL = iconURL;
    671         frameLoader()->didChangeIcons(this);
     664IconURL DocumentLoader::iconURL(IconType iconType) const
     665{
     666    return m_iconURLs[toIconIndex(iconType)];
     667}
     668
     669void DocumentLoader::setIconURL(const IconURL& url)
     670{
     671    if (url.m_iconURL.isEmpty())
     672        return;
     673
     674    if (iconURL(url.m_iconType).m_iconURL != url.m_iconURL) {
     675        m_iconURLs[toIconIndex(url.m_iconType)] = url;
     676        frameLoader()->didChangeIcons(this, url.m_iconType);
    672677    }
    673678}
  • trunk/Source/WebCore/loader/DocumentLoader.h

    r82580 r85785  
    3333#include "DocumentWriter.h"
    3434#include "IconDatabaseBase.h"
     35#include "IconURL.h"
    3536#include "NavigationAction.h"
    3637#include "ResourceError.h"
     
    124125        void setPrimaryLoadComplete(bool);
    125126        void setTitle(const StringWithDirection&);
    126         void setIconURL(const String&);
     127        void setIconURL(const IconURL&);
    127128        const String& overrideEncoding() const { return m_overrideEncoding; }
    128129
     
    171172        void stopRecordingResponses();
    172173        const StringWithDirection& title() const { return m_pageTitle; }
    173         const String& iconURL() const { return m_pageIconURL; }
     174        IconURL iconURL(IconType) const;
    174175
    175176        KURL urlForHistory() const;
     
    301302
    302303        StringWithDirection m_pageTitle;
    303         String m_pageIconURL;
     304        IconURL m_iconURLs[ICON_COUNT];
    304305
    305306        String m_overrideEncoding;
  • trunk/Source/WebCore/loader/EmptyClients.h

    r85653 r85785  
    272272    virtual void dispatchDidStartProvisionalLoad() { }
    273273    virtual void dispatchDidReceiveTitle(const StringWithDirection&) { }
    274     virtual void dispatchDidChangeIcons() { }
     274    virtual void dispatchDidChangeIcons(IconType) { }
    275275    virtual void dispatchDidCommitLoad() { }
    276276    virtual void dispatchDidFailProvisionalLoad(const ResourceError&) { }
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r85378 r85785  
    7070#include "IconDatabase.h"
    7171#include "IconLoader.h"
     72#include "IconURL.h"
    7273#include "InspectorController.h"
    7374#include "InspectorInstrumentation.h"
     
    468469KURL FrameLoader::iconURL()
    469470{
    470     // If this isn't a top level frame, return nothing
     471    IconURLs urls = iconURLs(Favicon);
     472    return urls.isEmpty() ? KURL() : urls[0].m_iconURL;
     473}
     474
     475IconURLs FrameLoader::iconURLs(int iconTypes)
     476{
     477    IconURLs iconURLs;
     478    if (iconTypes & Favicon && !fillIconURL(Favicon, &iconURLs))
     479        iconURLs.append(getDefaultIconURL(Favicon));
     480
     481#if ENABLE(TOUCH_ICON_LOADING)
     482    bool havePrecomposedIcon = false;
     483    if (iconTypes & TouchPrecomposedIcon)
     484        havePrecomposedIcon = fillIconURL(TouchPrecomposedIcon, &iconURLs);
     485
     486    bool haveTouchIcon = false;
     487    if (iconTypes & TouchIcon)
     488        haveTouchIcon = fillIconURL(TouchIcon, &iconURLs);
     489
     490    // Only return the default touch icons when the both were required and neither was gotten.
     491    if (iconTypes & TouchPrecomposedIcon && iconTypes & TouchIcon && !havePrecomposedIcon && !haveTouchIcon) {
     492        iconURLs.append(getDefaultIconURL(TouchPrecomposedIcon));
     493        iconURLs.append(getDefaultIconURL(TouchIcon));
     494    }
     495#endif
     496    return iconURLs;
     497}
     498
     499bool FrameLoader::fillIconURL(IconType iconType, IconURLs* iconURLs)
     500{
     501    // If this isn't a top level frame, return
    471502    if (m_frame->tree() && m_frame->tree()->parent())
    472         return KURL();
     503        return false;
    473504
    474505    // If we have an iconURL from a Link element, return that
    475     if (!m_frame->document()->iconURL().isEmpty())
    476         return KURL(ParsedURLString, m_frame->document()->iconURL());
    477 
     506    IconURL url = m_frame->document()->iconURL(iconType);
     507    if (url.m_iconURL.isEmpty())
     508        return false;
     509
     510    iconURLs->append(url);
     511
     512    return true;
     513}
     514
     515IconURL FrameLoader::getDefaultIconURL(IconType iconType)
     516{
    478517    // Don't return a favicon iconURL unless we're http or https
    479518    KURL documentURL = m_frame->document()->url();
    480519    if (!documentURL.protocolInHTTPFamily())
    481         return KURL();
     520        return IconURL();
    482521
    483522    KURL url;
     
    487526    if (documentURL.hasPort())
    488527        url.setPort(documentURL.port());
    489     url.setPath("/favicon.ico");
    490     return url;
     528    if (iconType == Favicon) {
     529        url.setPath("/favicon.ico");
     530        return IconURL(KURL(ParsedURLString, url), Favicon);
     531    }
     532#if ENABLE(TOUCH_ICON_LOADING)
     533    if (iconType == TouchPrecomposedIcon) {
     534        url.setPath("/apple-touch-icon-precomposed.png");
     535        return IconURL(KURL(ParsedURLString, url), TouchPrecomposedIcon);
     536    }
     537    if (iconType == TouchIcon) {
     538        url.setPath("/apple-touch-icon.png");
     539        return IconURL(KURL(ParsedURLString, url), TouchIcon);
     540    }
     541#endif
     542    return IconURL();
    491543}
    492544
     
    33583410}
    33593411
    3360 void FrameLoader::setIconURL(const String& iconURL)
     3412void FrameLoader::setIconURL(const IconURL& iconURL)
    33613413{
    33623414    documentLoader()->setIconURL(iconURL);
     
    34363488}
    34373489
    3438 void FrameLoader::didChangeIcons(DocumentLoader* loader)
     3490void FrameLoader::didChangeIcons(DocumentLoader* loader, IconType type)
    34393491{
    34403492    if (loader == m_documentLoader)
    3441         m_client->dispatchDidChangeIcons();
     3493        m_client->dispatchDidChangeIcons(type);
    34423494}
    34433495
  • trunk/Source/WebCore/loader/FrameLoader.h

    r85442 r85785  
    3737#include "HistoryController.h"
    3838#include "IconDatabaseBase.h"
     39#include "IconURL.h"
    3940#include "PolicyChecker.h"
    4041#include "ResourceLoadNotifier.h"
     
    192193    void willChangeTitle(DocumentLoader*);
    193194    void didChangeTitle(DocumentLoader*);
    194     void didChangeIcons(DocumentLoader*);
     195    void didChangeIcons(DocumentLoader*, IconType);
    195196
    196197    FrameLoadType loadType() const;
     
    234235    void willSetEncoding();
    235236
     237    // Returns favicon.
    236238    KURL iconURL();
     239
     240    // Returns the given iconTypes' IconURLs, iconTypes could be any combination of IconType.
     241    IconURLs iconURLs(int iconTypes);
    237242    void commitIconURLToIconDatabase(const KURL&);
    238243
     
    285290
    286291    void setTitle(const StringWithDirection&);
    287     void setIconURL(const String&);
     292    void setIconURL(const IconURL&);
    288293
    289294    void commitProvisionalLoad();
     
    428433
    429434    void updateSandboxFlags();
     435
     436    bool fillIconURL(IconType, IconURLs*);
     437    IconURL getDefaultIconURL(IconType);
    430438
    431439    Frame* m_frame;
  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r85109 r85785  
    3131
    3232#include "FrameLoaderTypes.h"
     33#include "IconURL.h"
    3334#include "ScrollTypes.h"
    3435#include <wtf/Forward.h>
     
    142143        virtual void dispatchDidStartProvisionalLoad() = 0;
    143144        virtual void dispatchDidReceiveTitle(const StringWithDirection&) = 0;
    144         virtual void dispatchDidChangeIcons() = 0;
     145        virtual void dispatchDidChangeIcons(IconType) = 0;
    145146        virtual void dispatchDidCommitLoad() = 0;
    146147        virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
  • trunk/Source/WebKit/chromium/ChangeLog

    r85759 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respected the change of FrameLoaderClient.
     9
     10        * src/FrameLoaderClientImpl.cpp:
     11        (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
     12        * src/FrameLoaderClientImpl.h:
     13
    1142011-05-04  Jay Civelli  <jcivelli@chromium.org>
    215
  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r85717 r85785  
    758758}
    759759
    760 void FrameLoaderClientImpl::dispatchDidChangeIcons()
     760void FrameLoaderClientImpl::dispatchDidChangeIcons(WebCore::IconType type)
    761761{
    762762    if (m_webFrame->client())
  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h

    r84260 r85785  
    106106    virtual void dispatchDidStartProvisionalLoad();
    107107    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    108     virtual void dispatchDidChangeIcons();
     108    virtual void dispatchDidChangeIcons(WebCore::IconType);
    109109    virtual void dispatchDidCommitLoad();
    110110    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
  • trunk/Source/WebKit/efl/ChangeLog

    r85741 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient
     9
     10        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     11        (WebCore::FrameLoaderClientEfl::dispatchDidChangeIcons):
     12        * WebCoreSupport/FrameLoaderClientEfl.h:
     13
    1142011-05-04  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    215
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r84260 r85785  
    588588}
    589589
    590 void FrameLoaderClientEfl::dispatchDidChangeIcons()
     590void FrameLoaderClientEfl::dispatchDidChangeIcons(WebCore::IconType)
    591591{
    592592    notImplemented();
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r84260 r85785  
    104104    virtual void dispatchDidStartProvisionalLoad();
    105105    virtual void dispatchDidReceiveTitle(const StringWithDirection&);
    106     virtual void dispatchDidChangeIcons();
     106    virtual void dispatchDidChangeIcons(WebCore::IconType);
    107107    virtual void dispatchDidCommitLoad();
    108108    virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
  • trunk/Source/WebKit/gtk/ChangeLog

    r85644 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     11        (WebKit::FrameLoaderClient::dispatchDidChangeIcons):
     12        * WebCoreSupport/FrameLoaderClientGtk.h:
     13
    1142011-05-03  Julien Chaffraix  <jchaffraix@codeaurora.org>
    215
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r85214 r85785  
    970970}
    971971
    972 void FrameLoaderClient::dispatchDidChangeIcons()
     972void FrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType)
    973973{
    974974    notImplemented();
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r84260 r85785  
    8383        virtual void dispatchDidStartProvisionalLoad();
    8484        virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    85         virtual void dispatchDidChangeIcons();
     85        virtual void dispatchDidChangeIcons(WebCore::IconType);
    8686        virtual void dispatchDidCommitLoad();
    8787        virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
  • trunk/Source/WebKit/mac/ChangeLog

    r85644 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11        * WebCoreSupport/WebFrameLoaderClient.h:
     12        * WebCoreSupport/WebFrameLoaderClient.mm:
     13        (WebFrameLoaderClient::dispatchDidChangeIcons):
     14
    1152011-05-03  Julien Chaffraix  <jchaffraix@codeaurora.org>
    216
  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r85340 r85785  
    119119ENABLE_MEDIA_STATISTICS = ;
    120120
     121ENABLE_TOUCH_ICON_LOADING = ;
     122
    121123ENABLE_WEB_AUDIO = ;
    122124
     
    133135ENABLE_XSLT = ENABLE_XSLT;
    134136
    135 FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     137FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

    r84260 r85785  
    103103    virtual void dispatchDidStartProvisionalLoad();
    104104    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    105     virtual void dispatchDidChangeIcons();
     105    virtual void dispatchDidChangeIcons(WebCore::IconType);
    106106    virtual void dispatchDidCommitLoad();
    107107    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r85515 r85785  
    634634}
    635635
    636 void WebFrameLoaderClient::dispatchDidChangeIcons()
     636void WebFrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType)
    637637{
    638638     // FIXME: Implement this to allow container to update favicon.
  • trunk/Source/WebKit/qt/ChangeLog

    r85774 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * WebCoreSupport/FrameLoaderClientQt.cpp:
     11        (WebCore::FrameLoaderClientQt::dispatchDidChangeIcons):
     12        * WebCoreSupport/FrameLoaderClientQt.h:
     13
    1142011-03-31  Luiz Agostini  <luiz.agostini@openbossa.org>
    215
  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r85774 r85785  
    461461
    462462
    463 void FrameLoaderClientQt::dispatchDidChangeIcons()
     463void FrameLoaderClientQt::dispatchDidChangeIcons(WebCore::IconType)
    464464{
    465465    if (dumpFrameLoaderCallbacks)
  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

    r82580 r85785  
    112112    virtual void dispatchDidStartProvisionalLoad();
    113113    virtual void dispatchDidReceiveTitle(const StringWithDirection&);
    114     virtual void dispatchDidChangeIcons();
     114    virtual void dispatchDidChangeIcons(WebCore::IconType);
    115115    virtual void dispatchDidCommitLoad();
    116116    virtual void dispatchDidFailProvisionalLoad(const ResourceError&);
  • trunk/Source/WebKit/win/ChangeLog

    r85699 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * WebCoreSupport/WebFrameLoaderClient.cpp:
     11        (WebFrameLoaderClient::dispatchDidChangeIcons):
     12        * WebCoreSupport/WebFrameLoaderClient.h:
     13
    1142011-05-02  Jer Noble  <jer.noble@apple.com>
    215
  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r85653 r85785  
    374374}
    375375
    376 void WebFrameLoaderClient::dispatchDidChangeIcons()
    377 {
     376void WebFrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType type)
     377{
     378    if (type != WebCore::Favicon)
     379        return;
     380
    378381    WebView* webView = m_webFrame->webView();
    379382    COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePriv;
  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h

    r84260 r85785  
    7171    virtual void dispatchDidStartProvisionalLoad();
    7272    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    73     virtual void dispatchDidChangeIcons();
     73    virtual void dispatchDidChangeIcons(WebCore::IconType);
    7474    virtual void dispatchDidCommitLoad();
    7575    virtual void dispatchDidFinishDocumentLoad();
  • trunk/Source/WebKit/wince/ChangeLog

    r85440 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     11        (WebKit::FrameLoaderClientWinCE::dispatchDidChangeIcons):
     12        * WebCoreSupport/FrameLoaderClientWinCE.h:
     13
    1142011-05-01  Patrick Gansterer  <paroga@webkit.org>
    215
  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r82580 r85785  
    377377}
    378378
    379 void FrameLoaderClientWinCE::dispatchDidChangeIcons()
     379void FrameLoaderClientWinCE::dispatchDidChangeIcons(WebCore::IconType)
    380380{
    381381    notImplemented();
  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h

    r84260 r85785  
    7878    virtual void dispatchDidStartProvisionalLoad();
    7979    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    80     virtual void dispatchDidChangeIcons();
     80    virtual void dispatchDidChangeIcons(WebCore::IconType);
    8181    virtual void dispatchDidCommitLoad();
    8282    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
  • trunk/Source/WebKit/wx/ChangeLog

    r84743 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respect the interface change in FrameLoaderClient.
     9
     10        * WebKitSupport/FrameLoaderClientWx.cpp:
     11        (WebCore::FrameLoaderClientWx::dispatchDidChangeIcons):
     12        * WebKitSupport/FrameLoaderClientWx.h:
     13
    1142011-04-23  Kevin Ollivier  <kevino@theolliviers.com>
    215
  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r82580 r85785  
    328328}
    329329
    330 void FrameLoaderClientWx::dispatchDidChangeIcons()
     330void FrameLoaderClientWx::dispatchDidChangeIcons(WebCore::IconType)
    331331{
    332332    notImplemented();
  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

    r82580 r85785  
    110110        virtual void dispatchDidFirstLayout();
    111111        virtual void dispatchDidFirstVisuallyNonEmptyLayout();
    112         virtual void dispatchDidChangeIcons();
     112        virtual void dispatchDidChangeIcons(WebCore::IconType);
    113113
    114114        virtual void dispatchShow();
  • trunk/Source/WebKit2/ChangeLog

    r85783 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Respected the change of FrameLoaderClient.
     9        Added WebIconURL and WebIconType responding the new IconURL and IconType.
     10        Supported to get the multiple icon urls.
     11
     12        * Configurations/FeatureDefines.xcconfig:
     13        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     14        (WebKit::WebFrameLoaderClient::dispatchDidChangeIcons):
     15        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     16
    1172011-05-04  Anders Carlsson  <andersca@apple.com>
    218
  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r85340 r85785  
    119119ENABLE_MEDIA_STATISTICS = ;
    120120
     121ENABLE_TOUCH_ICON_LOADING = ;
     122
    121123ENABLE_WEB_AUDIO = ;
    122124
     
    133135ENABLE_XSLT = ENABLE_XSLT;
    134136
    135 FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     137FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r85493 r85785  
    419419}
    420420
    421 void WebFrameLoaderClient::dispatchDidChangeIcons()
     421void WebFrameLoaderClient::dispatchDidChangeIcons(WebCore::IconType)
    422422{
    423423    notImplemented();
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r85109 r85785  
    8686    virtual void dispatchDidStartProvisionalLoad();
    8787    virtual void dispatchDidReceiveTitle(const WebCore::StringWithDirection&);
    88     virtual void dispatchDidChangeIcons();
     88    virtual void dispatchDidChangeIcons(WebCore::IconType);
    8989    virtual void dispatchDidCommitLoad();
    9090    virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
  • trunk/Tools/ChangeLog

    r85777 r85785  
     12011-05-04  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Populate touch-icon url to FrameLoaderClient
     6        https://bugs.webkit.org/show_bug.cgi?id=59143
     7
     8        Disable touch icon by default.
     9
     10        * Scripts/build-webkit:
     11
    1122011-05-04  Justin Novosad  <junov@chromium.org>
    213
  • trunk/Tools/Scripts/build-webkit

    r85723 r85785  
    113113    $tiledBackingStoreSupport,
    114114    $touchEventsSupport,
     115    $touchIconLoadingSupport,
    115116    $videoSupport,
    116117    $wcssSupport,
     
    272273    { option => "touch-events", desc => "Toggle Touch Events support",
    273274      define => "ENABLE_TOUCH_EVENTS", default => isQt(), value => \$touchEventsSupport },
     275
     276    { option => "touch-icon-loading", desc => "Toggle Touch Icon Loading Support",
     277      define => "ENABLE_TOUCH_ICON_LOADING", default => 0, value => \$touchIconLoadingSupport },
    274278
    275279    { option => "video", desc => "Toggle Video support",
Note: See TracChangeset for help on using the changeset viewer.