Changeset 116561 in webkit
- Timestamp:
- May 9, 2012 3:06:27 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r116557 r116561 1 2012-05-09 Mark Pilgrim <pilgrim@chromium.org> 2 3 [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly 4 https://bugs.webkit.org/show_bug.cgi?id=84417 5 6 Reviewed by Adam Barth. 7 8 Part of a refactoring series. See tracking bug 82948. 9 10 * WebCore.gyp/WebCore.gyp: 11 * WebCore.gypi: 12 * platform/chromium/PlatformSupport.h: 13 (PlatformSupport): 14 * platform/graphics/chromium/ImageChromium.cpp: 15 (WebCore::Image::loadPlatformResource): 16 * platform/graphics/chromium/ImageChromiumMac.mm: Removed. 17 1 18 2012-05-09 Rob Buis <rbuis@rim.com> 2 19 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r116360 r116561 1655 1655 ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'], 1656 1656 ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'], 1657 ['exclude', 'platform/graphics/chromium/ImageChromiumMac\\.mm$'],1658 1657 ['exclude', 'platform/graphics/mac/FontMac\\.mm$'], 1659 1658 ['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'], -
trunk/Source/WebCore/WebCore.gypi
r116549 r116561 3569 3569 'platform/graphics/chromium/ImageBufferDataSkia.h', 3570 3570 'platform/graphics/chromium/ImageChromium.cpp', 3571 'platform/graphics/chromium/ImageChromiumMac.mm',3572 3571 'platform/graphics/chromium/ImageLayerChromium.cpp', 3573 3572 'platform/graphics/chromium/ImageLayerChromium.h', -
trunk/Source/WebCore/platform/chromium/PlatformSupport.h
r116388 r116561 197 197 198 198 // Resources ---------------------------------------------------------- 199 static PassRefPtr<Image> loadPlatformImageResource(const char* name);200 201 199 #if ENABLE(WEB_AUDIO) 202 200 static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t, double sampleRate); -
trunk/Source/WebCore/platform/graphics/chromium/ImageChromium.cpp
r95901 r116561 30 30 31 31 #include "config.h" 32 #include "BitmapImage.h" 32 33 #include "Image.h" 34 #include "SharedBuffer.h" 33 35 34 #include "PlatformSupport.h" 36 #include <public/Platform.h> 37 #include <public/WebData.h> 35 38 36 39 namespace WebCore { … … 40 43 PassRefPtr<Image> Image::loadPlatformResource(const char *name) 41 44 { 42 return PlatformSupport::loadPlatformImageResource(name); 45 const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name); 46 if (resource.isEmpty()) 47 return Image::nullImage(); 48 49 RefPtr<Image> image = BitmapImage::create(); 50 image->setData(resource, true); 51 return image.release(); 43 52 } 44 53 -
trunk/Source/WebKit/chromium/ChangeLog
r116558 r116561 1 2012-05-09 Mark Pilgrim <pilgrim@chromium.org> 2 3 [Chromium] Remove PlatformSupport::loadPlatformImageResource, call loadResource directly 4 https://bugs.webkit.org/show_bug.cgi?id=84417 5 6 Reviewed by Adam Barth. 7 8 Part of a refactoring series. See tracking bug 82948. 9 10 * src/PlatformSupport.cpp: 11 (WebCore): 12 1 13 2012-05-09 Jochen Eisinger <jochen@chromium.org> 2 14 -
trunk/Source/WebKit/chromium/src/PlatformSupport.cpp
r116388 r116561 553 553 554 554 // Resources ------------------------------------------------------------------ 555 556 PassRefPtr<Image> PlatformSupport::loadPlatformImageResource(const char* name)557 {558 const WebData& resource = webKitPlatformSupport()->loadResource(name);559 if (resource.isEmpty())560 return Image::nullImage();561 562 RefPtr<Image> image = BitmapImage::create();563 image->setData(resource, true);564 return image;565 }566 555 567 556 #if ENABLE(WEB_AUDIO)
Note: See TracChangeset
for help on using the changeset viewer.