diff --git a/ChangeLog b/ChangeLog index f59329f302f0a964daecdb81b4036df4c5d4e309..86b4c011ff23c721f8f3b79e64c9389dff32655d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * Source/autotools/SetupWebKitFeatures.m4: + * Source/cmake/WebKitFeatures.cmake: + * Source/cmakeconfig.h.cmake: + 2013-05-18 Patrick Gansterer [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 3b57855301fdd58f6daa2f815aec56a8450539b2..073d2f4ad6c0902baac38d9bd4431c08cc8437ff 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,14 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * Configurations/FeatureDefines.xcconfig: + 2013-05-18 Patrick Gansterer [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig index 495a9fdd479ad4b627595974f837fb95047b99cc..da2f92071aa5aca4e47a25d21fff9209f9f2b12f 100644 --- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig +++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig @@ -126,7 +126,6 @@ ENABLE_LEGACY_NOTIFICATIONS_macosx_1090 = ENABLE_LEGACY_NOTIFICATIONS; ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES; ENABLE_LEGACY_WEB_AUDIO = ENABLE_LEGACY_WEB_AUDIO; ENABLE_LINK_PREFETCH = ; -ENABLE_LINK_PRERENDER = ; ENABLE_MATHML = ENABLE_MATHML; ENABLE_MEDIA_SOURCE = ; ENABLE_MEDIA_STATISTICS = ; diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 617edb05c5ab6bd5906afd3161871f0fa0db32d3..5e648fbb4415ec809f87a924589589358baa073e 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,14 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * wtf/FeatureDefines.h: + 2013-05-18 Patrick Gansterer [CMake] Replace *_LIBRARY_NAME with *_OUTPUT_NAME diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h index c7aea064144b079fb1391c477beff6ec5bb92588..89f3066f6093965e8ad5029b23b069dbfd2e1788 100644 --- a/Source/WTF/wtf/FeatureDefines.h +++ b/Source/WTF/wtf/FeatureDefines.h @@ -572,10 +572,6 @@ #define ENABLE_LINK_PREFETCH 0 #endif -#if !defined(ENABLE_LINK_PRERENDER) -#define ENABLE_LINK_PRERENDER 0 -#endif - #if !defined(ENABLE_MATHML) #define ENABLE_MATHML 1 #endif diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7d64bc84f0603b709478dcc8fdccee0891d812c7..d4ef2963c93b49802cd02aacb600d12f5de10689 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,46 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + * Configurations/FeatureDefines.xcconfig: + * GNUmakefile.list.am: + * Target.pri: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.vcxproj/WebCore.vcxproj: + * WebCore.vcxproj/WebCore.vcxproj.filters: + * WebCore.xcodeproj/project.pbxproj: + * dom/Document.cpp: + (WebCore::Document::Document): + * dom/Document.h: + (WebCore): + (Document): + * dom/EventNames.h: + (WebCore): + * html/HTMLLinkElement.cpp: + * html/HTMLLinkElement.h: + * html/LinkRelAttribute.cpp: + (WebCore::LinkRelAttribute::LinkRelAttribute): + * html/LinkRelAttribute.h: + (LinkRelAttribute): + * loader/LinkLoader.cpp: + (WebCore::LinkLoader::~LinkLoader): + (WebCore::LinkLoader::loadLink): + (WebCore::LinkLoader::released): + * loader/LinkLoader.h: + (WebCore): + (LinkLoader): + * loader/LinkLoaderClient.h: + (LinkLoaderClient): + * loader/Prerenderer.cpp: Removed. + * loader/Prerenderer.h: Removed. + * loader/PrerendererClient.cpp: Removed. + * loader/PrerendererClient.h: Removed. + * platform/PrerenderClient.h: Removed. + * platform/PrerenderHandle.h: Removed. + 2013-05-19 Simon Fraser Change the terminology used by rendering code when painting a given node and its children from "paintingRoot" to "subtreePaintRoot" diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig index 495a9fdd479ad4b627595974f837fb95047b99cc..c431e275fa873b3db25d03cb7aa9791428aa2801 100644 --- a/Source/WebCore/Configurations/FeatureDefines.xcconfig +++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig @@ -126,7 +126,6 @@ ENABLE_LEGACY_NOTIFICATIONS_macosx_1090 = ENABLE_LEGACY_NOTIFICATIONS; ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES; ENABLE_LEGACY_WEB_AUDIO = ENABLE_LEGACY_WEB_AUDIO; ENABLE_LINK_PREFETCH = ; -ENABLE_LINK_PRERENDER = ; ENABLE_MATHML = ENABLE_MATHML; ENABLE_MEDIA_SOURCE = ; ENABLE_MEDIA_STATISTICS = ; @@ -184,4 +183,4 @@ ENABLE_WORKERS = ENABLE_WORKERS; ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT; ENABLE_XSLT = ENABLE_XSLT; -FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); +FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 478b1c179f7ebed83d8bb0490a74d42c3d3107c5..bae5f393fb9de68e6689ba273fed965576b396cc 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -4132,10 +4132,6 @@ webcore_sources += \ Source/WebCore/loader/PolicyCallback.h \ Source/WebCore/loader/PolicyChecker.cpp \ Source/WebCore/loader/PolicyChecker.h \ - Source/WebCore/loader/Prerenderer.cpp \ - Source/WebCore/loader/Prerenderer.h \ - Source/WebCore/loader/PrerendererClient.cpp \ - Source/WebCore/loader/PrerendererClient.h \ Source/WebCore/loader/ProgressTracker.cpp \ Source/WebCore/loader/ProgressTracker.h \ Source/WebCore/loader/NavigationScheduler.cpp \ @@ -5953,8 +5949,6 @@ webcore_platform_sources += \ Source/WebCore/platform/PopupMenuClient.h \ Source/WebCore/platform/PopupMenu.h \ Source/WebCore/platform/PopupMenuStyle.h \ - Source/WebCore/platform/PrerenderClient.h \ - Source/WebCore/platform/PrerenderHandle.h \ Source/WebCore/platform/PublicSuffix.h \ Source/WebCore/platform/PurgeableBuffer.h \ Source/WebCore/platform/PurgePriority.h \ diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index b026bec913dd243d7e000ee380b6be7c9f0d2c65..4df78d4987995b6832cade446f7a6c58482d85ff 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -887,8 +887,6 @@ SOURCES += \ loader/PolicyCallback.cpp \ loader/PolicyChecker.cpp \ loader/ProgressTracker.cpp \ - loader/Prerenderer.cpp \ - loader/PrerendererClient.cpp \ loader/NavigationScheduler.cpp \ loader/ResourceBuffer.cpp \ loader/ResourceLoader.cpp \ @@ -2055,8 +2053,6 @@ HEADERS += \ loader/NavigationAction.h \ loader/NetscapePlugInStreamLoader.h \ loader/PlaceholderDocument.h \ - loader/Prerenderer.h \ - loader/PrerendererClient.h \ loader/ProgressTracker.h \ loader/ResourceBuffer.h \ loader/ResourceLoader.h \ @@ -2397,8 +2393,6 @@ HEADERS += \ platform/Timer.h \ platform/Widget.h \ platform/PlatformStrategies.h \ - platform/PrerenderClient.h \ - platform/PrerenderHandle.h \ platform/LocalizedStrings.h \ plugins/DOMMimeTypeArray.h \ plugins/DOMMimeType.h \ diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index 997a0b4f2182d7c276454610025c8ec6baafad0b..71895af8bb3c4d10245e20e540177e3663c6ab27 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -28118,22 +28118,6 @@ RelativePath="..\loader\PolicyChecker.h" > - - - - - - - - @@ -29086,14 +29070,6 @@ RelativePath="..\platform\PopupMenuStyle.h" > - - - - diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj index 14ceebfdc4f27c139eabc80ad7b0d3fb5aa53cab..5b632a3c25aa7661e8c7565521c2d4ab267ca792 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj +++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj @@ -3996,8 +3996,6 @@ - - @@ -11443,8 +11441,6 @@ - - @@ -11563,8 +11559,6 @@ - - diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters index 8b0fd22ceb2c7b3c5beea6830c8755e7802d7c13..3158e07987c46a9ae5ccaedceeb6f03f4b9498b5 100644 --- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters +++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters @@ -918,12 +918,6 @@ loader - - loader - - - loader - loader @@ -7644,12 +7638,6 @@ loader - - loader - - - loader - loader @@ -7974,12 +7962,6 @@ platform - - platform - - - platform - platform diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index f7bd067ae147d95de8c02ace38e50d17406da6b9..d664d5201b0d61d6a66451c2b8d515c871e22795 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -3273,12 +3273,8 @@ 97F8E666151D4A4E00D2D181 /* WorkerContextNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */; }; 9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 9831AE49154225A200FE2644 /* ReferrerPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; }; 984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; }; - 9856F8CD1549E82400B04F3A /* Prerenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9856F8C91549E82400B04F3A /* Prerenderer.h */; }; - 9856F8CF1549E82400B04F3A /* PrerendererClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 9856F8CB1549E82400B04F3A /* PrerendererClient.h */; }; - 9856F8D11549E84F00B04F3A /* PrerenderHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9856F8D01549E84F00B04F3A /* PrerenderHandle.h */; }; 985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */; }; 985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 985BB96C13A94058007A0B69 /* LinkRelAttribute.h */; }; - 986EA88315FFF29000985E5E /* PrerenderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 986EA88215FFF29000985E5E /* PrerenderClient.h */; }; 98CE4326129E00BD005821DC /* LinkLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 98CE4325129E00BD005821DC /* LinkLoader.cpp */; }; 98CE432A129E00E5005821DC /* LinkLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 98CE4329129E00E5005821DC /* LinkLoader.h */; }; 98EB1F951313FE0500D0E1EA /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = 98EB1F941313FE0500D0E1EA /* NotImplemented.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -9743,12 +9739,8 @@ 97F8E663151D4A3F00D2D181 /* WorkerContextNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextNotifications.idl; path = Modules/notifications/WorkerContextNotifications.idl; sourceTree = ""; }; 9831AE49154225A200FE2644 /* ReferrerPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReferrerPolicy.h; sourceTree = ""; }; 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoaderClient.h; sourceTree = ""; }; - 9856F8C91549E82400B04F3A /* Prerenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prerenderer.h; path = loader/Prerenderer.h; sourceTree = SOURCE_ROOT; }; - 9856F8CB1549E82400B04F3A /* PrerendererClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrerendererClient.h; path = loader/PrerendererClient.h; sourceTree = SOURCE_ROOT; }; - 9856F8D01549E84F00B04F3A /* PrerenderHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrerenderHandle.h; sourceTree = ""; }; 985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkRelAttribute.cpp; sourceTree = ""; }; 985BB96C13A94058007A0B69 /* LinkRelAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkRelAttribute.h; sourceTree = ""; }; - 986EA88215FFF29000985E5E /* PrerenderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrerenderClient.h; sourceTree = ""; }; 98CE4325129E00BD005821DC /* LinkLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkLoader.cpp; sourceTree = ""; }; 98CE4329129E00E5005821DC /* LinkLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoader.h; sourceTree = ""; }; 98EB1F941313FE0500D0E1EA /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = ""; }; @@ -13404,8 +13396,6 @@ 1A8F6BB90DB55CDC001DB794 /* DOMApplicationCache.idl */, 1A8F6BBA0DB55CDC001DB794 /* ManifestParser.cpp */, 1A8F6BBB0DB55CDC001DB794 /* ManifestParser.h */, - 9856F8C91549E82400B04F3A /* Prerenderer.h */, - 9856F8CB1549E82400B04F3A /* PrerendererClient.h */, ); path = appcache; sourceTree = ""; @@ -19387,8 +19377,6 @@ 0668E1890ADD9624004128E0 /* PopupMenu.h */, ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */, BC3BE12A0E98092F00835588 /* PopupMenuStyle.h */, - 986EA88215FFF29000985E5E /* PrerenderClient.h */, - 9856F8D01549E84F00B04F3A /* PrerenderHandle.h */, 0081FEFD16B0A244008AAA7A /* PublicSuffix.h */, E4D687780ED7AE4F006EA978 /* PurgeableBuffer.h */, 7E33CD00127F340D00BE8F17 /* PurgePriority.h */, @@ -23091,10 +23079,6 @@ 37919C240B7D188600A56998 /* PositionIterator.h in Headers */, 9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */, C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */, - 986EA88315FFF29000985E5E /* PrerenderClient.h in Headers */, - 9856F8CD1549E82400B04F3A /* Prerenderer.h in Headers */, - 9856F8CF1549E82400B04F3A /* PrerendererClient.h in Headers */, - 9856F8D11549E84F00B04F3A /* PrerenderHandle.h in Headers */, B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */, A8EA7EBC0A1945D000A8EF5F /* ProcessingInstruction.h in Headers */, E44613EC0CD681B500FADA75 /* ProgressEvent.h in Headers */, diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 75eafe843a24ae14875f7ce87c2769361713fa8c..70eeb3143788343ac6f5d5de7eda7bbcb2551e4f 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -231,10 +231,6 @@ #include "NodeRareData.h" #endif -#if ENABLE(LINK_PRERENDER) -#include "Prerenderer.h" -#endif - #if ENABLE(TEXT_AUTOSIZING) #include "TextAutosizer.h" #endif @@ -517,9 +513,6 @@ Document::Document(Frame* frame, const KURL& url, unsigned documentClasses) m_cachedResourceLoader = CachedResourceLoader::create(0); m_cachedResourceLoader->setDocument(this); -#if ENABLE(LINK_PRERENDER) - m_prerenderer = Prerenderer::create(this); -#endif #if ENABLE(TEXT_AUTOSIZING) m_textAutosizer = TextAutosizer::create(this); #endif diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h index 2efe6a6d7968f842974858952d1af1059e306369..b284afc32a9ee21e561254c6346dc004cfe97ca9 100644 --- a/Source/WebCore/dom/Document.h +++ b/Source/WebCore/dom/Document.h @@ -180,10 +180,6 @@ class ScriptedAnimationController; class MicroDataItemList; #endif -#if ENABLE(LINK_PRERENDER) -class Prerenderer; -#endif - #if ENABLE(TEXT_AUTOSIZING) class TextAutosizer; #endif @@ -1153,10 +1149,6 @@ public: IntSize initialViewportSize() const; #endif -#if ENABLE(LINK_PRERENDER) - Prerenderer* prerenderer() { return m_prerenderer.get(); } -#endif - #if ENABLE(TEXT_AUTOSIZING) TextAutosizer* textAutosizer() { return m_textAutosizer.get(); } #endif @@ -1545,10 +1537,6 @@ private: Timer m_pendingTasksTimer; Vector > m_pendingTasks; -#if ENABLE(LINK_PRERENDER) - OwnPtr m_prerenderer; -#endif - #if ENABLE(TEXT_AUTOSIZING) OwnPtr m_textAutosizer; #endif diff --git a/Source/WebCore/dom/EventNames.h b/Source/WebCore/dom/EventNames.h index 9627adbd8486fe7bd6625884f8dc6c1720bf3237..85f847138ae643c9daab93e202aa8e4ddf03feb5 100644 --- a/Source/WebCore/dom/EventNames.h +++ b/Source/WebCore/dom/EventNames.h @@ -252,11 +252,6 @@ namespace WebCore { \ macro(webkitdeviceproximity) \ \ - macro(webkitprerenderstart) \ - macro(webkitprerenderstop) \ - macro(webkitprerenderload) \ - macro(webkitprerenderdomcontentloaded) \ - \ macro(securitypolicyviolation) \ \ diff --git a/Source/WebCore/html/HTMLLinkElement.cpp b/Source/WebCore/html/HTMLLinkElement.cpp index 9fde7ec7f132f0e0505409f310727234bb07567c..df731721caf59941e7656d36c24a36f071ef19c2 100644 --- a/Source/WebCore/html/HTMLLinkElement.cpp +++ b/Source/WebCore/html/HTMLLinkElement.cpp @@ -349,28 +349,6 @@ void HTMLLinkElement::linkLoadingErrored() dispatchEvent(Event::create(eventNames().errorEvent, false, false)); } -#if ENABLE(LINK_PRERENDER) -void HTMLLinkElement::didStartLinkPrerender() -{ - dispatchEvent(Event::create(eventNames().webkitprerenderstartEvent, false, false)); -} - -void HTMLLinkElement::didStopLinkPrerender() -{ - dispatchEvent(Event::create(eventNames().webkitprerenderstopEvent, false, false)); -} - -void HTMLLinkElement::didSendLoadForLinkPrerender() -{ - dispatchEvent(Event::create(eventNames().webkitprerenderloadEvent, false, false)); -} - -void HTMLLinkElement::didSendDOMContentLoadedForLinkPrerender() -{ - dispatchEvent(Event::create(eventNames().webkitprerenderdomcontentloadedEvent, false, false)); -} -#endif - bool HTMLLinkElement::sheetLoaded() { if (!styleSheetIsLoading()) { diff --git a/Source/WebCore/html/HTMLLinkElement.h b/Source/WebCore/html/HTMLLinkElement.h index 94680c832b2b85e7c043b6776b1f02582729e905..aa4f98cfe403d5e33c083afe17baae1cee06ba04 100644 --- a/Source/WebCore/html/HTMLLinkElement.h +++ b/Source/WebCore/html/HTMLLinkElement.h @@ -91,12 +91,6 @@ private: virtual void linkLoaded() OVERRIDE; virtual void linkLoadingErrored() OVERRIDE; -#if ENABLE(LINK_PRERENDER) - virtual void didStartLinkPrerender() OVERRIDE; - virtual void didStopLinkPrerender() OVERRIDE; - virtual void didSendLoadForLinkPrerender() OVERRIDE; - virtual void didSendDOMContentLoadedForLinkPrerender() OVERRIDE; -#endif bool isAlternate() const { return m_disabledState == Unset && m_relAttribute.m_isAlternate; } diff --git a/Source/WebCore/html/LinkRelAttribute.cpp b/Source/WebCore/html/LinkRelAttribute.cpp index 87071b99b28d65d218f0abd2db8a57cd001f6a62..712e3706907c8dcea17ac56ff4eed12bf94b1885 100644 --- a/Source/WebCore/html/LinkRelAttribute.cpp +++ b/Source/WebCore/html/LinkRelAttribute.cpp @@ -43,9 +43,6 @@ LinkRelAttribute::LinkRelAttribute() , m_isLinkPrefetch(false) , m_isLinkSubresource(false) #endif -#if ENABLE(LINK_PRERENDER) - , m_isLinkPrerender(false) -#endif { } @@ -58,9 +55,6 @@ LinkRelAttribute::LinkRelAttribute(const String& rel) , m_isLinkPrefetch(false) , m_isLinkSubresource(false) #endif -#if ENABLE(LINK_PRERENDER) - , m_isLinkPrerender(false) -#endif { if (equalIgnoringCase(rel, "stylesheet")) m_isStyleSheet = true; @@ -102,10 +96,6 @@ LinkRelAttribute::LinkRelAttribute(const String& rel) m_isLinkPrefetch = true; else if (equalIgnoringCase(*it, "subresource")) m_isLinkSubresource = true; -#endif -#if ENABLE(LINK_PRERENDER) - else if (equalIgnoringCase(*it, "prerender")) - m_isLinkPrerender = true; #endif } } diff --git a/Source/WebCore/html/LinkRelAttribute.h b/Source/WebCore/html/LinkRelAttribute.h index 98dd48191c9f8373ef24b1d229b1223e2da27615..fd6fabf3118495921c6d32ce309940b0d7979393 100644 --- a/Source/WebCore/html/LinkRelAttribute.h +++ b/Source/WebCore/html/LinkRelAttribute.h @@ -46,9 +46,6 @@ public: bool m_isLinkPrefetch; bool m_isLinkSubresource; #endif -#if ENABLE(LINK_PRERENDER) - bool m_isLinkPrerender; -#endif LinkRelAttribute(); explicit LinkRelAttribute(const String&); diff --git a/Source/WebCore/loader/LinkLoader.cpp b/Source/WebCore/loader/LinkLoader.cpp index 54e04f2274c4445b8b5517a667c1b55564c0b734..b9bccd9b2a04531524fe8b2c4ff30291a18631fa 100644 --- a/Source/WebCore/loader/LinkLoader.cpp +++ b/Source/WebCore/loader/LinkLoader.cpp @@ -45,11 +45,6 @@ #include "Settings.h" #include "StyleResolver.h" -#if ENABLE(LINK_PRERENDER) -#include "PrerenderHandle.h" -#include "Prerenderer.h" -#endif - namespace WebCore { LinkLoader::LinkLoader(LinkLoaderClient* client) @@ -63,10 +58,6 @@ LinkLoader::~LinkLoader() { if (m_cachedLinkResource) m_cachedLinkResource->removeClient(this); -#if ENABLE(LINK_PRERENDER) - if (m_prerenderHandle) - m_prerenderHandle->removeClient(); -#endif } void LinkLoader::linkLoadTimerFired(Timer* timer) @@ -94,30 +85,6 @@ void LinkLoader::notifyFinished(CachedResource* resource) m_cachedLinkResource = 0; } -#if ENABLE(LINK_PRERENDER) - -void LinkLoader::didStartPrerender() -{ - m_client->didStartLinkPrerender(); -} - -void LinkLoader::didStopPrerender() -{ - m_client->didStopLinkPrerender(); -} - -void LinkLoader::didSendLoadForPrerender() -{ - m_client->didSendLoadForLinkPrerender(); -} - -void LinkLoader::didSendDOMContentLoadedForPrerender() -{ - m_client->didSendDOMContentLoadedForLinkPrerender(); -} - -#endif - bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, const String& type, const String& sizes, const KURL& href, Document* document) { @@ -160,26 +127,11 @@ bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, const String& ty } #endif -#if ENABLE(LINK_PRERENDER) - if (relAttribute.m_isLinkPrerender) { - ASSERT(!m_prerenderHandle); - m_prerenderHandle = document->prerenderer()->render(this, href); - } -#endif return true; } void LinkLoader::released() { - // Only prerenders need treatment here; other links either use the CachedResource interface, or are notionally - // atomic (dns prefetch). -#if ENABLE(LINK_PRERENDER) - if (m_prerenderHandle) { - m_prerenderHandle->cancel(); - m_prerenderHandle->removeClient(); - m_prerenderHandle.clear(); - } -#endif } } diff --git a/Source/WebCore/loader/LinkLoader.h b/Source/WebCore/loader/LinkLoader.h index 8b87d822d0e7d5f7891429669778daf05fbc3611..e2513572118fc98a8cf7102def14b1b8b23c3659 100644 --- a/Source/WebCore/loader/LinkLoader.h +++ b/Source/WebCore/loader/LinkLoader.h @@ -35,7 +35,6 @@ #include "CachedResourceClient.h" #include "CachedResourceHandle.h" #include "LinkLoaderClient.h" -#include "PrerenderClient.h" #include "Timer.h" #include @@ -46,12 +45,8 @@ class Document; class KURL; struct LinkRelAttribute; -#if ENABLE(LINK_PRERENDER) -class PrerenderHandle; -#endif - -// The LinkLoader can load link rel types icon, dns-prefetch, subresource, prefetch and prerender. -class LinkLoader : public CachedResourceClient, public PrerenderClient { +// The LinkLoader can load link rel types icon, dns-prefetch, subresource and prefetch. +class LinkLoader : public CachedResourceClient { public: explicit LinkLoader(LinkLoaderClient*); @@ -59,14 +54,6 @@ public: // from CachedResourceClient virtual void notifyFinished(CachedResource*); - -#if ENABLE(LINK_PRERENDER) - // from PrerenderClient - virtual void didStartPrerender() OVERRIDE; - virtual void didStopPrerender() OVERRIDE; - virtual void didSendLoadForPrerender() OVERRIDE; - virtual void didSendDOMContentLoadedForPrerender() OVERRIDE; -#endif void released(); bool loadLink(const LinkRelAttribute&, const String& type, const String& sizes, const KURL&, Document*); @@ -80,10 +67,6 @@ private: CachedResourceHandle m_cachedLinkResource; Timer m_linkLoadTimer; Timer m_linkLoadingErrorTimer; - -#if ENABLE(LINK_PRERENDER) - RefPtr m_prerenderHandle; -#endif }; } diff --git a/Source/WebCore/loader/LinkLoaderClient.h b/Source/WebCore/loader/LinkLoaderClient.h index 1e1db2b29aabc0353abad1b60f1a727096115fd9..4350ee78c95a763f9cc5d45e5a8e162a9b1a5063 100644 --- a/Source/WebCore/loader/LinkLoaderClient.h +++ b/Source/WebCore/loader/LinkLoaderClient.h @@ -42,13 +42,6 @@ public: virtual void linkLoaded() = 0; virtual void linkLoadingErrored() = 0; // There is no notification for cancellation. - -#if ENABLE(LINK_PRERENDER) - virtual void didStartLinkPrerender() = 0; - virtual void didStopLinkPrerender() = 0; - virtual void didSendLoadForLinkPrerender() = 0; - virtual void didSendDOMContentLoadedForLinkPrerender() = 0; -#endif }; } diff --git a/Source/WebCore/loader/Prerenderer.cpp b/Source/WebCore/loader/Prerenderer.cpp deleted file mode 100644 index 48c3b42e74cf481c96b2ffdfe2936ccf2e3bac21..0000000000000000000000000000000000000000 --- a/Source/WebCore/loader/Prerenderer.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) 2012 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 "Prerenderer.h" - -#if ENABLE(LINK_PRERENDER) - -#include "Document.h" -#include "Frame.h" -#include "FrameLoader.h" -#include "PrerenderHandle.h" -#include "PrerendererClient.h" -#include "ReferrerPolicy.h" -#include "SecurityPolicy.h" - -#include -#include -#include -#include - -namespace WebCore { - -// static -PassOwnPtr Prerenderer::create(Document* document) -{ - Prerenderer* prerenderer = new Prerenderer(document); - prerenderer->suspendIfNeeded(); - return adoptPtr(prerenderer); -} - -Prerenderer::Prerenderer(Document* document) - : ActiveDOMObject(document) - , m_initializedClient(false) - , m_client(0) -{ -} - -Prerenderer::~Prerenderer() -{ -} - -PassRefPtr Prerenderer::render(PrerenderClient* prerenderClient, const KURL& url) -{ - // Prerenders are unlike requests in most ways (for instance, they pass down fragments, and they don't return data), - // but they do have referrers. - const ReferrerPolicy referrerPolicy = document()->referrerPolicy(); - - if (!document()->frame()) - return 0; - - const String referrer = SecurityPolicy::generateReferrerHeader(referrerPolicy, url, document()->frame()->loader()->outgoingReferrer()); - - RefPtr prerenderHandle = PrerenderHandle::create(prerenderClient, url, referrer, referrerPolicy); - - if (client()) - client()->willAddPrerender(prerenderHandle.get()); - prerenderHandle->add(); - - m_activeHandles.append(prerenderHandle); - return prerenderHandle; -} - -void Prerenderer::stop() -{ - while (!m_activeHandles.isEmpty()) { - RefPtr handle = m_activeHandles[0].release(); - m_activeHandles.remove(0); - handle->abandon(); - } - while (!m_suspendedHandles.isEmpty()) { - RefPtr handle = m_suspendedHandles[0].release(); - m_suspendedHandles.remove(0); - handle->abandon(); - } -} - -void Prerenderer::suspend(ReasonForSuspension reason) -{ - if (reason == DocumentWillBecomeInactive || reason == PageWillBeSuspended) { - while (!m_activeHandles.isEmpty()) { - RefPtr handle = m_activeHandles[0].release(); - m_activeHandles.remove(0); - handle->suspend(); - m_suspendedHandles.append(handle); - } - } -} - -void Prerenderer::resume() -{ - while (!m_suspendedHandles.isEmpty()) { - RefPtr handle = m_suspendedHandles[0].release(); - m_suspendedHandles.remove(0); - handle->resume(); - m_activeHandles.append(handle); - } -} - -Document* Prerenderer::document() -{ - ASSERT(scriptExecutionContext()->isDocument()); - return toDocument(scriptExecutionContext()); -} - -PrerendererClient* Prerenderer::client() -{ - if (!m_initializedClient) { - // We can't initialize the client in our contructor, because the platform might not have - // provided our supplement by then. - m_initializedClient = true; - m_client = PrerendererClient::from(document()->page()); - } - return m_client; -} - -} - -#endif // ENABLE(LINK_PRERENDER) diff --git a/Source/WebCore/loader/Prerenderer.h b/Source/WebCore/loader/Prerenderer.h deleted file mode 100644 index 54d53ddee0ac584ea2bc39b10dee0764636a6b07..0000000000000000000000000000000000000000 --- a/Source/WebCore/loader/Prerenderer.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2012 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. - * - */ - -#ifndef Prerenderer_h -#define Prerenderer_h - -#if ENABLE(LINK_PRERENDER) - -#include "ActiveDOMObject.h" -#include "KURL.h" -#include -#include -#include -#include -#include -#include - -namespace WebCore { - -class Document; -class PrerenderClient; -class PrerenderHandle; -class PrerendererClient; -class Page; - -class Prerenderer : public ActiveDOMObject { - WTF_MAKE_NONCOPYABLE(Prerenderer); -public: - virtual ~Prerenderer(); - - PassRefPtr render(PrerenderClient*, const KURL&); - - static PassOwnPtr create(Document*); - - // From ActiveDOMObject: - virtual bool canSuspend() const OVERRIDE { return true; } - virtual void stop() OVERRIDE; - virtual void suspend(ReasonForSuspension) OVERRIDE; - virtual void resume() OVERRIDE; - -private: - typedef Vector > HandleVector; - typedef Vector KURLVector; - - explicit Prerenderer(Document*); - - Document* document(); - PrerendererClient* client(); - - bool m_initializedClient; - PrerendererClient* m_client; - HandleVector m_activeHandles; - HandleVector m_suspendedHandles; -}; - -} - -#endif // ENABLE(LINK_PRERENDER) - -#endif // Prerenderer_h diff --git a/Source/WebCore/loader/PrerendererClient.cpp b/Source/WebCore/loader/PrerendererClient.cpp deleted file mode 100644 index 86701130404fa0cc8deb2ceec51b7c6694e35099..0000000000000000000000000000000000000000 --- a/Source/WebCore/loader/PrerendererClient.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2012 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 "PrerendererClient.h" - -#include "Page.h" -#include "Supplementable.h" - -#if ENABLE(LINK_PRERENDER) - -namespace WebCore { - -// static -const char* PrerendererClient::supplementName() -{ - return "PrerendererClient"; -} - -// static -PrerendererClient* PrerendererClient::from(Page* page) -{ - PrerendererClient* supplement = static_cast(Supplement::from(page, supplementName())); - return supplement; -} - -void providePrerendererClientTo(Page* page, PrerendererClient* client) -{ - PrerendererClient::provideTo(page, PrerendererClient::supplementName(), adoptPtr(client)); -} - -} - -#endif diff --git a/Source/WebCore/loader/PrerendererClient.h b/Source/WebCore/loader/PrerendererClient.h deleted file mode 100644 index 335158db4f533a4ccdb46f1e5c1881e96600122c..0000000000000000000000000000000000000000 --- a/Source/WebCore/loader/PrerendererClient.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2012 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. - * - */ - -#ifndef PrerendererClient_h -#define PrerendererClient_h - -#if ENABLE(LINK_PRERENDER) - -#include "Supplementable.h" -#include - -namespace WebCore { - -class Document; -class Page; -class PrerenderHandle; - -class PrerendererClient : public Supplement { -public: - virtual ~PrerendererClient() { } - - virtual void willAddPrerender(PrerenderHandle*) = 0; - - static const char* supplementName(); - static PrerendererClient* from(Page*); - -protected: - PrerendererClient() { } -}; - -void providePrerendererClientTo(Page*, PrerendererClient*); - -} // namespace WebCore - -#endif // ENABLED(LINK_PRERENDER) - -#endif // PrerendererClient_h diff --git a/Source/WebCore/platform/PrerenderClient.h b/Source/WebCore/platform/PrerenderClient.h deleted file mode 100644 index b2882de56eaeca5c5992f470b1627e8058f58e22..0000000000000000000000000000000000000000 --- a/Source/WebCore/platform/PrerenderClient.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2012 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. - * - */ - -#ifndef PrerenderClient_h -#define PrerenderClient_h - -namespace WebCore { - -class PrerenderClient { -#if ENABLE(LINK_PRERENDER) -public: - virtual ~PrerenderClient() { } - - virtual void didStartPrerender() = 0; - virtual void didStopPrerender() = 0; - virtual void didSendLoadForPrerender() = 0; - virtual void didSendDOMContentLoadedForPrerender() = 0; -#endif -}; - -} - - -#endif diff --git a/Source/WebCore/platform/PrerenderHandle.h b/Source/WebCore/platform/PrerenderHandle.h deleted file mode 100644 index f48e3207e571b0c692b0dcf303a4621958f46459..0000000000000000000000000000000000000000 --- a/Source/WebCore/platform/PrerenderHandle.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2012 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. - * - */ - -#ifndef PrerenderHandle_h -#define PrerenderHandle_h - -#if ENABLE(LINK_PRERENDER) - -#include "ReferrerPolicy.h" -#include -#include -#include -#include - -namespace WebCore { - -class KURL; -class Prerender; -class PrerenderClient; - -class PrerenderHandle : public RefCounted { - WTF_MAKE_NONCOPYABLE(PrerenderHandle); -public: - static PassRefPtr create(PrerenderClient*, const KURL&, const String& referrer, ReferrerPolicy); - ~PrerenderHandle(); - - Prerender* prerender(); - - void removeClient(); - - // A prerender link element is added when it is inserted into a document. - void add(); - - // A prerender is abandoned when it's navigated away from. This is is a weaker signal - // than cancel(), since the launcher hasn't indicated that the prerender isn't wanted, - // and we may end up using it after, for instance, a short redirect chain. - void abandon(); - - // A prerender is canceled when it is removed from a document. - void cancel(); - - // A prerender is suspended along with the DOM containing its linkloader & prerenderer. - void suspend(); - void resume(); - - const KURL& url() const; - const String& referrer() const; - ReferrerPolicy referrerPolicy() const; - -private: - PrerenderHandle(PrerenderClient*, const KURL&, const String& referrer, ReferrerPolicy); - - RefPtr m_prerender; -}; - -} // namespace WebCore - -#endif // ENABLE(LINK_PRERENDER) - -#endif // PrerenderHandle_h diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog index d561db6164aea75a1bf770ce07c96fba36a4278b..018d6e2df9c471dd7d8f695dc845f14248735f0c 100644 --- a/Source/WebKit/blackberry/ChangeLog +++ b/Source/WebKit/blackberry/ChangeLog @@ -1,3 +1,14 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * WebCoreSupport/AboutDataEnableFeatures.in: + 2013-05-19 Anders Carlsson Remove ChromeClient::webView() diff --git a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in index 094ce4b7c76a70f3a994dd49dac91604b4535dc6..b05f1d0af0bef9925f062a54770ca73d5b84ef0e 100644 --- a/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in +++ b/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in @@ -119,7 +119,6 @@ LEGACY_NOTIFICATIONS LEGACY_VIEWPORT_ADAPTION LEGACY_WEB_AUDIO LINK_PREFETCH -LINK_PRERENDER LLINT LLINT_C_LOOP MATHML diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index 93f4865aaf79b2abe7c96b2ad2b9346b0c26d1b8..d25771f6c68b617e7305d9113d997b9bd9ec64cc 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,14 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * Configurations/FeatureDefines.xcconfig: + 2013-05-19 Anders Carlsson Remove ChromeClient::webView() diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig index ef101b826f59288d43a4001d9cb2a6d49612f828..c7f758f0ca8b69c8c2f92c6807e612377384838a 100644 --- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig +++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig @@ -126,7 +126,6 @@ ENABLE_LEGACY_NOTIFICATIONS_macosx_1090 = ENABLE_LEGACY_NOTIFICATIONS; ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES; ENABLE_LEGACY_WEB_AUDIO = ENABLE_LEGACY_WEB_AUDIO; ENABLE_LINK_PREFETCH = ; -ENABLE_LINK_PRERENDER = ; ENABLE_MATHML = ENABLE_MATHML; ENABLE_MEDIA_SOURCE = ; ENABLE_MEDIA_STATISTICS = ; @@ -184,4 +183,4 @@ ENABLE_WORKERS = ENABLE_WORKERS; ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT; ENABLE_XSLT = ENABLE_XSLT; -FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); \ No newline at end of file +FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); \ No newline at end of file diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index e6520873b2a140f882f2012ef412f2d8376d56a2..4f0b29fb278cc9a5579c39bdec779a4f253d4df9 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2013-05-19 Anders Carlsson + + Remove link prerendering code + https://bugs.webkit.org/show_bug.cgi?id=116415 + + Reviewed by Darin Adler. + + This code was only used by Chromium and is dead now. + + * Configurations/FeatureDefines.xcconfig: + 2013-05-18 Anders Carlsson Simplify the StorageArea setter functions diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig index 495a9fdd479ad4b627595974f837fb95047b99cc..c431e275fa873b3db25d03cb7aa9791428aa2801 100644 --- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig +++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig @@ -126,7 +126,6 @@ ENABLE_LEGACY_NOTIFICATIONS_macosx_1090 = ENABLE_LEGACY_NOTIFICATIONS; ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES; ENABLE_LEGACY_WEB_AUDIO = ENABLE_LEGACY_WEB_AUDIO; ENABLE_LINK_PREFETCH = ; -ENABLE_LINK_PRERENDER = ; ENABLE_MATHML = ENABLE_MATHML; ENABLE_MEDIA_SOURCE = ; ENABLE_MEDIA_STATISTICS = ; @@ -184,4 +183,4 @@ ENABLE_WORKERS = ENABLE_WORKERS; ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT; ENABLE_XSLT = ENABLE_XSLT; -FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); +FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIALOG_ELEMENT) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MICRODATA) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(FEATURE_DEFINES_$(PLATFORM_NAME)); diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4 index 9e683b6f7186e0960c3dde2d257d9e37b5309ae9..ad48dad68ceae7a3e5c5d527344b36a4687c2a58 100644 --- a/Source/autotools/SetupWebKitFeatures.m4 +++ b/Source/autotools/SetupWebKitFeatures.m4 @@ -146,7 +146,6 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \ ENABLE_LEGACY_VENDOR_PREFIXES=1 \ ENABLE_LEGACY_WEB_AUDIO=0 \ ENABLE_LINK_PREFETCH=0 \ - ENABLE_LINK_PRERENDER=0 \ ENABLE_MATHML=0 \ ENABLE_MEDIA_CAPTURE=0 \ ENABLE_MEDIA_SOURCE=0 \ diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake index d88a3a764d09b5121a30f051289a7731adf33988..ce3bcc128b49748c6e17ca6cf6972f93b3aab5fc 100644 --- a/Source/cmake/WebKitFeatures.cmake +++ b/Source/cmake/WebKitFeatures.cmake @@ -78,7 +78,6 @@ macro(WEBKIT_OPTION_BEGIN) WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VENDOR_PREFIXES "Toggle Legacy Vendor Prefix Support" ON) WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEB_AUDIO "Toggle Legacy Web Audio support" ON) WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF) - WEBKIT_OPTION_DEFINE(ENABLE_LINK_PRERENDER "Toggle pre rendering support" OFF) WEBKIT_OPTION_DEFINE(ENABLE_LLINT "Enable JSC Low Level Interpreter" OFF) WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON) WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" OFF) diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake index 975cd8089f76aaeb1bcbb2dbbd4ce1ef1a67556e..54087d6ee6d5262f650e2ee39d1b422f111b02fb 100644 --- a/Source/cmakeconfig.h.cmake +++ b/Source/cmakeconfig.h.cmake @@ -71,7 +71,6 @@ #cmakedefine01 ENABLE_LEGACY_WEB_AUDIO #cmakedefine01 ENABLE_LEGACY_WEBKIT_BLOB_BUILDER #cmakedefine01 ENABLE_LINK_PREFETCH -#cmakedefine01 ENABLE_LINK_PRERENDER #cmakedefine01 ENABLE_LLINT #cmakedefine01 ENABLE_MATHML #cmakedefine01 ENABLE_MEDIA_CAPTURE