Attachment 138035 Details for Bug 84417 – Patch

[patch] Patch

bug-84417-20120419232748.patch (text/plain), 5.12 KB, created by Mark Pilgrim (Google) on 2012-04-19 20:28:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-19 20:28:04 PDT

Size: 5.12 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 114713)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2012-04-19  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84417
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+        * platform/graphics/chromium/ImageChromium.cpp:
>+        (WebCore::Image::loadPlatformResource):
>+        * platform/graphics/chromium/ImageChromiumMac.mm:
>+        (WebCore::Image::loadPlatformResource):
>+
> 2012-04-19  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r114711.
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 114713)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -216,8 +216,6 @@ public:
>     static bool popupsAllowed(NPP);
> 
>     // Resources ----------------------------------------------------------
>-    static PassRefPtr<Image> loadPlatformImageResource(const char* name);
>-
> #if ENABLE(WEB_AUDIO)
>     static PassOwnPtr<AudioBus> loadPlatformAudioResource(const char* name, double sampleRate);
>     static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t, double sampleRate);
>Index: Source/WebCore/platform/graphics/chromium/ImageChromium.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/ImageChromium.cpp	(revision 114713)
>+++ Source/WebCore/platform/graphics/chromium/ImageChromium.cpp	(working copy)
>@@ -29,9 +29,12 @@
>  */
> 
> #include "config.h"
>+#include "BitmapImage.h"
> #include "Image.h"
>+#include "SharedBuffer.h"
> 
>-#include "PlatformSupport.h"
>+#include <public/Platform.h>
>+#include <public/WebData.h>
> 
> namespace WebCore {
> 
>@@ -39,7 +42,13 @@ namespace WebCore {
> 
> PassRefPtr<Image> Image::loadPlatformResource(const char *name)
> {
>-    return PlatformSupport::loadPlatformImageResource(name);
>+    const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name);
>+    if (resource.isEmpty())
>+        return Image::nullImage();
>+
>+    RefPtr<Image> image = BitmapImage::create();
>+    image->setData(resource, true);
>+    return image;
> }
> 
> } // namespace WebCore
>Index: Source/WebCore/platform/graphics/chromium/ImageChromiumMac.mm
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/ImageChromiumMac.mm	(revision 114713)
>+++ Source/WebCore/platform/graphics/chromium/ImageChromiumMac.mm	(working copy)
>@@ -32,15 +32,25 @@
> 
> #include "config.h"
> #include "BitmapImage.h"
>-
> #include "Image.h"
>-#include "PlatformSupport.h"
>+#include "SharedBuffer.h"
>+
>+#include <public/Platform.h>
>+#include <public/WebData.h>
>+
>+#include <public/Platform.h>
> 
> namespace WebCore {
> 
> PassRefPtr<Image> Image::loadPlatformResource(const char* name)
> {
>-    return PlatformSupport::loadPlatformImageResource(name);
>+    const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name);
>+    if (resource.isEmpty())
>+        return Image::nullImage();
>+
>+    RefPtr<Image> image = BitmapImage::create();
>+    image->setData(resource, true);
>+    return image;
> }
> 
> // FIXME: These are temporary stubs, we need real implementations which
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 114713)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-04-19  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly
>+        https://bugs.webkit.org/show_bug.cgi?id=84417
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-04-19  Joshua Bell  <jsbell@chromium.org>
> 
>         [Chromium] IndexedDB: Prep for changing keyPath return type
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 114713)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -572,17 +572,6 @@ NPObject* PlatformSupport::pluginScripta
> 
> // Resources ------------------------------------------------------------------
> 
>-PassRefPtr<Image> PlatformSupport::loadPlatformImageResource(const char* name)
>-{
>-    const WebData& resource = webKitPlatformSupport()->loadResource(name);
>-    if (resource.isEmpty())
>-        return Image::nullImage();
>-
>-    RefPtr<Image> image = BitmapImage::create();
>-    image->setData(resource, true);
>-    return image;
>-}
>-
> #if ENABLE(WEB_AUDIO)
> 
> PassOwnPtr<AudioBus> PlatformSupport::loadPlatformAudioResource(const char* name, double sampleRate)

Actions: View | Formatted Diff | Diff

Attachments on bug 84417: 138035 | 140943 | 140988