Changeset 228201 in webkit

Timestamp:

Feb 6, 2018 4:32:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Use downcast in createLinkPreloadResourceClient
​https://bugs.webkit.org/show_bug.cgi?id=182488

Patch by Youenn Fablet <​youenn@apple.com> on 2018-02-06
Reviewed by Antti Koivisto.

No observable change of behavior.
Add a new link preloader client for text track.

• loader/LinkLoader.cpp:

(WebCore::createLinkPreloadResourceClient):

• loader/LinkPreloadResourceClients.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/LinkLoader.cpp (modified) (1 diff)
• loader/LinkPreloadResourceClients.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-06  Youenn Fablet  <youenn@apple.com>
+
+        Use downcast in createLinkPreloadResourceClient
+        https://bugs.webkit.org/show_bug.cgi?id=182488
+
+        Reviewed by Antti Koivisto.
+
+        No observable change of behavior.
+        Add a new link preloader client for text track.
+
+        * loader/LinkLoader.cpp:
+        (WebCore::createLinkPreloadResourceClient):
+        * loader/LinkPreloadResourceClients.h:
+
 2018-02-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -140 +140 @@
     switch (resource.type()) {
     case CachedResource::ImageResource:
-        return LinkPreloadImageResourceClient::create(loader, static_cast<CachedImage&>(resource));
+        return LinkPreloadImageResourceClient::create(loader, downcast<CachedImage>(resource));
     case CachedResource::Script:
-        return LinkPreloadScriptResourceClient::create(loader, static_cast<CachedScript&>(resource));
+        return LinkPreloadDefaultResourceClient::create(loader, downcast<CachedScript>(resource));
     case CachedResource::CSSStyleSheet:
-        return LinkPreloadStyleResourceClient::create(loader, static_cast<CachedCSSStyleSheet&>(resource));
+        return LinkPreloadStyleResourceClient::create(loader, downcast<CachedCSSStyleSheet>(resource));
     case CachedResource::FontResource:
-        return LinkPreloadFontResourceClient::create(loader, static_cast<CachedFont&>(resource));
-    case CachedResource::MediaResource:
-        if (!RuntimeEnabledFeatures::sharedFeatures().mediaPreloadingEnabled())
-            ASSERT_NOT_REACHED();
-        FALLTHROUGH;
+        return LinkPreloadFontResourceClient::create(loader, downcast<CachedFont>(resource));
 #if ENABLE(VIDEO_TRACK)
     case CachedResource::TextTrackResource:
-#endif
+        return LinkPreloadDefaultResourceClient::create(loader, downcast<CachedTextTrack>(resource));
+#endif
+    case CachedResource::MediaResource:
+        ASSERT(RuntimeEnabledFeatures::sharedFeatures().mediaPreloadingEnabled());
+        FALLTHROUGH;
     case CachedResource::RawResource:
-        return LinkPreloadRawResourceClient::create(loader, static_cast<CachedRawResource&>(resource));
+        return LinkPreloadRawResourceClient::create(loader, downcast<CachedRawResource>(resource));
     case CachedResource::MainResource:
     case CachedResource::Icon:

trunk/Source/WebCore/loader/LinkPreloadResourceClients.h

@@ -37 +37 @@
 #include "CachedScript.h"
 #include "CachedStyleSheetClient.h"
+#include "CachedTextTrack.h"
 
 #include <wtf/WeakPtr.h>
@@ -77 +78 @@
 };
 
-class LinkPreloadScriptResourceClient: public LinkPreloadResourceClient, CachedResourceClient {
-public:
-    static std::unique_ptr<LinkPreloadScriptResourceClient> create(LinkLoader& loader, CachedScript& resource)
-    {
-        return std::unique_ptr<LinkPreloadScriptResourceClient>(new LinkPreloadScriptResourceClient(loader, resource));
-    }
-
-    virtual ~LinkPreloadScriptResourceClient() = default;
+class LinkPreloadDefaultResourceClient: public LinkPreloadResourceClient, CachedResourceClient {
+public:
+    static std::unique_ptr<LinkPreloadDefaultResourceClient> create(LinkLoader& loader, CachedScript& resource)
+    {
+        return std::unique_ptr<LinkPreloadDefaultResourceClient>(new LinkPreloadDefaultResourceClient(loader, resource));
+    }
+
+    static std::unique_ptr<LinkPreloadDefaultResourceClient> create(LinkLoader& loader, CachedTextTrack& resource)
+    {
+        return std::unique_ptr<LinkPreloadDefaultResourceClient>(new LinkPreloadDefaultResourceClient(loader, resource));
+    }
+
+    virtual ~LinkPreloadDefaultResourceClient() = default;
 
 
@@ -93 +99 @@
 
 private:
-    LinkPreloadScriptResourceClient(LinkLoader& loader, CachedScript& resource)
+    LinkPreloadDefaultResourceClient(LinkLoader& loader, CachedResource& resource)
         : LinkPreloadResourceClient(loader, resource)
     {