Attachment 179117 Details for Bug 104838 – ROLLOUT of r137490

[patch] ROLLOUT of r137490

bug-104838-20121212213816.patch (text/plain), 3.17 KB, created by WebKit Review Bot on 2012-12-12 13:31:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Review Bot

Created: 2012-12-12 13:31:56 PST

Size: 3.17 KB

patch

obsolete

>Subversion Revision: 137508
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 862dd4a9d0147076b34ba147c1143e2a101e714a..66bc1e05f1cce1ca209b31ddfc378928bf6b8256 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,20 @@
>+2012-12-12  Sheriff Bot  <webkit.review.bot@gmail.com>
>+
>+        Unreviewed, rolling out r137490.
>+        http://trac.webkit.org/changeset/137490
>+        https://bugs.webkit.org/show_bug.cgi?id=104838
>+
>+        Breaks Chromium build due to references to
>+        WebSharedWorkerRepository (Requested by aklein on #webkit).
>+
>+        * public/platform/WebKitPlatformSupport.h:
>+        (WebKit):
>+        (WebKitPlatformSupport):
>+        (WebKit::WebKitPlatformSupport::sharedWorkerRepository):
>+        * src/SharedWorkerRepository.cpp:
>+        (WebKit::sharedWorkerRepository):
>+        (WebCore::SharedWorkerRepository::isAvailable):
>+
> 2012-12-12  Alpha Lam  <hclam@chromium.org>
> 
>         [chromium] Minimize memcpy for encoded image data in ImageFrameGenerator
>diff --git a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
>index b6245b934e9465105d8091b938393072d2df1b34..05199e3adec1d4ee82dd7fe8dced537ecb6d9a16 100644
>--- a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
>+++ b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
>@@ -36,6 +36,7 @@
> namespace WebKit {
> 
> class WebIDBFactory; // FIXME: Does this belong in platform?
>+class WebSharedWorkerRepository; // FIXME: Does this belong in platform?
> 
> // FIXME: Eventually all these API will need to move to WebKit::Platform.
> class WebKitPlatformSupport : public Platform {
>@@ -44,6 +45,11 @@ public:
> 
>     virtual WebIDBFactory* idbFactory() { return 0; }
> 
>+
>+    // Shared Workers ------------------------------------------------------
>+
>+    virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
>+
> protected:
>     ~WebKitPlatformSupport() { }
> };
>diff --git a/Source/WebKit/chromium/src/SharedWorkerRepository.cpp b/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
>index 844b9056fe3260a5c3c1260b8820f9fe70e2941d..da019b42e472c3f8195e5d39ece121a4ab2be8a4 100644
>--- a/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
>+++ b/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
>@@ -69,8 +69,15 @@ void setSharedWorkerRepository(WebSharedWorkerRepository* repository)
> 
> static WebSharedWorkerRepository* sharedWorkerRepository()
> {
>-    // Will only be non-zero if the embedder has set the shared worker repository upon initialization. Nothing in WebKit sets this.
>-    return s_sharedWorkerRepository;
>+    WebSharedWorkerRepository* repository;
>+
>+    repository = s_sharedWorkerRepository;
>+    if (!repository) {
>+        repository = webKitPlatformSupport()->sharedWorkerRepository();
>+        setSharedWorkerRepository(repository);
>+    }
>+
>+    return repository;
> }
> 
> }
>@@ -211,6 +218,8 @@ void SharedWorkerScriptLoader::connected()
> 
> bool SharedWorkerRepository::isAvailable()
> {
>+    // Allow the WebKitPlatformSupport to determine if SharedWorkers
>+    // are available.
>     return WebKit::sharedWorkerRepository();
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 104838: 179117