Title: [132688] trunk
- Revision
- 132688
- Author
- [email protected]
- Date
- 2012-10-26 13:12:25 -0700 (Fri, 26 Oct 2012)
Log Message
[BlackBerry] Platform Abstraction for WebKit Resource/Image Loading
https://bugs.webkit.org/show_bug.cgi?id=100518
PR 231732
Reviewed by Yong Li.
.:
Remove RESOURCE_PATH from webkit, this is now abstracted in our platform layer.
* Source/cmake/OptionsBlackBerry.cmake:
Source/WebCore:
Use the new resource/image loading abstraction ResourceStore.
* platform/graphics/blackberry/ImageBlackBerry.cpp:
(WebCore::Image::loadPlatformResource):
Modified Paths
Diff
Modified: trunk/ChangeLog (132687 => 132688)
--- trunk/ChangeLog 2012-10-26 20:02:41 UTC (rev 132687)
+++ trunk/ChangeLog 2012-10-26 20:12:25 UTC (rev 132688)
@@ -1,3 +1,16 @@
+2012-10-26 Rob Buis <[email protected]>
+
+ [BlackBerry] Platform Abstraction for WebKit Resource/Image Loading
+ https://bugs.webkit.org/show_bug.cgi?id=100518
+
+ PR 231732
+
+ Reviewed by Yong Li.
+
+ Remove RESOURCE_PATH from webkit, this is now abstracted in our platform layer.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2012-10-26 Regina Chung <[email protected]>
[EFL][WK2] Enable WebGL
Modified: trunk/Source/WebCore/ChangeLog (132687 => 132688)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 20:02:41 UTC (rev 132687)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 20:12:25 UTC (rev 132688)
@@ -1,3 +1,17 @@
+2012-10-26 Rob Buis <[email protected]>
+
+ [BlackBerry] Platform Abstraction for WebKit Resource/Image Loading
+ https://bugs.webkit.org/show_bug.cgi?id=100518
+
+ PR 231732
+
+ Reviewed by Yong Li.
+
+ Use the new resource/image loading abstraction ResourceStore.
+
+ * platform/graphics/blackberry/ImageBlackBerry.cpp:
+ (WebCore::Image::loadPlatformResource):
+
2012-10-26 Bear Travis <[email protected]>
[CSS Exclusions] Block children have incorrect offset when shape-inside element lays out below other elements
Modified: trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp (132687 => 132688)
--- trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp 2012-10-26 20:02:41 UTC (rev 132687)
+++ trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp 2012-10-26 20:12:25 UTC (rev 132688)
@@ -23,17 +23,20 @@
#include "ImageBuffer.h"
#include "SharedBuffer.h"
+#include <BlackBerryPlatformResourceStore.h>
+
+using BlackBerry::Platform::ResourceData;
+using BlackBerry::Platform::ResourceStore;
+
namespace WebCore {
PassRefPtr<Image> Image::loadPlatformResource(const char *name)
{
- // RESOURCE_PATH is set by CMake in OptionsBlackBerry.cmake
- String fullPath(RESOURCE_PATH);
- String extension(".png");
+ ResourceData data = ""
+ if (!data.data())
+ return BitmapImage::nullImage();
- fullPath = fullPath + name + extension;
-
- RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(fullPath);
+ RefPtr<SharedBuffer> buffer = SharedBuffer::create(data.data(), data.len());
if (!buffer)
return BitmapImage::nullImage();
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (132687 => 132688)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-10-26 20:02:41 UTC (rev 132687)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-10-26 20:12:25 UTC (rev 132688)
@@ -135,7 +135,6 @@
endif()
ENDIF ()
-ADD_DEFINITIONS(-DRESOURCE_PATH="/usr/share/webkit/resources/")
INCLUDE_DIRECTORIES(${CMAKE_INCLUDE_PATH})
SET(JSC_EXECUTABLE_NAME jsc)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
