Attachment 346547 Details for Bug 188175 – Add and load image resources

[patch] Add and load image resources

188175-1.diff (text/plain), 21.28 KB, created by Stephan Szabo on 2018-08-03 14:26:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Szabo

Created: 2018-08-03 14:26:58 PDT

Size: 21.28 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index aaefbdf1b89..09e2db3b341 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,46 @@
>+2018-08-03  Stephan Szabo  <stephan.szabo@sony.com>
>+
>+        [WinCairo] Search inputs do not show icons
>+        https://bugs.webkit.org/show_bug.cgi?id=188175
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformWin.cmake:
>+        * Platform/win/WebKit.resources/WebKit.aps: Added.
>+        * Platform/win/WebKit.resources/WebKit.rc: Added.
>+        * Platform/win/WebKit.resources/deleteButton.png: Added.
>+        * Platform/win/WebKit.resources/deleteButtonPressed.png: Added.
>+        * Platform/win/WebKit.resources/fsVideoAudioVolumeHigh.png: Added.
>+        * Platform/win/WebKit.resources/fsVideoAudioVolumeLow.png: Added.
>+        * Platform/win/WebKit.resources/fsVideoExitFullscreen.png: Added.
>+        * Platform/win/WebKit.resources/fsVideoPause.png: Added.
>+        * Platform/win/WebKit.resources/fsVideoPlay.png: Added.
>+        * Platform/win/WebKit.resources/missingImage.png: Added.
>+        * Platform/win/WebKit.resources/nullplugin.png: Added.
>+        * Platform/win/WebKit.resources/panEastCursor.png: Added.
>+        * Platform/win/WebKit.resources/panIcon.png: Added.
>+        * Platform/win/WebKit.resources/panNorthCursor.png: Added.
>+        * Platform/win/WebKit.resources/panNorthEastCursor.png: Added.
>+        * Platform/win/WebKit.resources/panNorthWestCursor.png: Added.
>+        * Platform/win/WebKit.resources/panSouthCursor.png: Added.
>+        * Platform/win/WebKit.resources/panSouthEastCursor.png: Added.
>+        * Platform/win/WebKit.resources/panSouthWestCursor.png: Added.
>+        * Platform/win/WebKit.resources/panWestCursor.png: Added.
>+        * Platform/win/WebKit.resources/searchCancel.png: Added.
>+        * Platform/win/WebKit.resources/searchCancelPressed.png: Added.
>+        * Platform/win/WebKit.resources/searchMagnifier.png: Added.
>+        * Platform/win/WebKit.resources/searchMagnifierResults.png: Added.
>+        * Platform/win/WebKit.resources/textAreaResizeCorner.png: Added.
>+        * Platform/win/WebKit.resources/verticalTextCursor.png: Added.
>+        * Platform/win/WebKit.resources/zoomInCursor.png: Added.
>+        * Platform/win/WebKit.resources/zoomOutCursor.png: Added.
>+        * Platform/win/WebKitDLL.cpp: Added.
>+        (DllMain): Keep track of webkit dll instance
>+        * Platform/win/resource.h: Added.
>+        * WebProcess/win/WebProcessWin.cpp:
>+        (loadResourceIntoBuffer): Add implementation for loading resource
>+        data from webkit.dll resources
>+
> 2018-08-01  Alex Christensen  <achristensen@webkit.org>
> 
>         Allow WebFramePolicyListenerProxy to be used multiple times
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/WebKit.aps b/Source/WebKit/Platform/win/WebKit.resources/WebKit.aps
>new file mode 100644
>index 00000000000..6cdba287ca4
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/WebKit.aps differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/WebKit.rc b/Source/WebKit/Platform/win/WebKit.resources/WebKit.rc
>new file mode 100644
>index 00000000000..672ede759b7
>--- /dev/null
>+++ b/Source/WebKit/Platform/win/WebKit.resources/WebKit.rc
>@@ -0,0 +1,52 @@
>+// Microsoft Visual C++ generated resource script.
>+//
>+#include "autoversion.h"
>+#include "resource.h"
>+#include "winresrc.h"
>+
>+#ifdef _WIN32
>+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
>+#pragma code_page(1252)
>+#endif //_WIN32
>+
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// PNG
>+//
>+
>+IDR_RESIZE_CORNER                PNG                     "textAreaResizeCorner.png"
>+IDR_MISSING_IMAGE                PNG                     "missingImage.png"
>+IDR_NULL_PLUGIN                  PNG                     "nullplugin.png"
>+IDR_DELETE_BUTTON                PNG                     "deleteButton.png"
>+IDR_DELETE_BUTTON_PRESSED        PNG                     "deleteButtonPressed.png"
>+IDR_ZOOM_IN_CURSOR               PNG                     "zoomInCursor.png"
>+IDR_ZOOM_OUT_CURSOR              PNG                     "zoomOutCursor.png"
>+IDR_VERTICAL_TEXT_CURSOR         PNG                     "verticalTextCursor.png"
>+IDR_PAN_SCROLL_ICON              PNG                     "panIcon.png"
>+IDR_PAN_SOUTH_CURSOR             PNG                     "panSouthCursor.png"
>+IDR_PAN_NORTH_CURSOR             PNG                     "panNorthCursor.png"
>+IDR_PAN_EAST_CURSOR              PNG                     "panEastCursor.png"
>+IDR_PAN_WEST_CURSOR              PNG                     "panWestCursor.png"
>+IDR_PAN_SOUTH_EAST_CURSOR        PNG                     "panSouthEastCursor.png"
>+IDR_PAN_SOUTH_WEST_CURSOR        PNG                     "panSouthWestCursor.png"
>+IDR_PAN_NORTH_EAST_CURSOR        PNG                     "panNorthEastCursor.png"
>+IDR_PAN_NORTH_WEST_CURSOR        PNG                     "panNorthWestCursor.png"
>+IDR_SEARCH_CANCEL                PNG                     "searchCancel.png"
>+IDR_SEARCH_CANCEL_PRESSED        PNG                     "searchCancelPressed.png"
>+IDR_SEARCH_MAGNIFIER             PNG                     "searchMagnifier.png"
>+IDR_SEARCH_MAGNIFIER_RESULTS     PNG                     "searchMagnifierResults.png"
>+IDR_FS_VIDEO_AUDIO_VOLUME_HIGH   PNG                     "fsVideoAudioVolumeHigh.png"
>+IDR_FS_VIDEO_AUDIO_VOLUME_LOW    PNG                     "fsVideoAudioVolumeLow.png"
>+IDR_FS_VIDEO_EXIT_FULLSCREEN     PNG                     "fsVideoExitFullscreen.png"
>+IDR_FS_VIDEO_PAUSE               PNG                     "fsVideoPause.png"
>+IDR_FS_VIDEO_PLAY                PNG                     "fsVideoPlay.png"
>+
>+/////////////////////////////////////////////////////////////////////////////
>+//
>+// STRINGTABLE
>+//
>+
>+STRINGTABLE 
>+BEGIN
>+    BUILD_NUMBER __BUILD_NUMBER_SHORT__
>+END
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/deleteButton.png b/Source/WebKit/Platform/win/WebKit.resources/deleteButton.png
>new file mode 100644
>index 00000000000..8f1b881246d
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/deleteButton.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/deleteButtonPressed.png b/Source/WebKit/Platform/win/WebKit.resources/deleteButtonPressed.png
>new file mode 100644
>index 00000000000..77d31ca43af
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/deleteButtonPressed.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeHigh.png b/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeHigh.png
>new file mode 100644
>index 00000000000..d04df37e08a
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeHigh.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeLow.png b/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeLow.png
>new file mode 100644
>index 00000000000..e824a21653b
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/fsVideoAudioVolumeLow.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/fsVideoExitFullscreen.png b/Source/WebKit/Platform/win/WebKit.resources/fsVideoExitFullscreen.png
>new file mode 100644
>index 00000000000..01ce6929f31
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/fsVideoExitFullscreen.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/fsVideoPause.png b/Source/WebKit/Platform/win/WebKit.resources/fsVideoPause.png
>new file mode 100644
>index 00000000000..b98fb369812
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/fsVideoPause.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/fsVideoPlay.png b/Source/WebKit/Platform/win/WebKit.resources/fsVideoPlay.png
>new file mode 100644
>index 00000000000..035aeb27fcd
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/fsVideoPlay.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/missingImage.png b/Source/WebKit/Platform/win/WebKit.resources/missingImage.png
>new file mode 100644
>index 00000000000..f49a98d59d2
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/missingImage.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/nullplugin.png b/Source/WebKit/Platform/win/WebKit.resources/nullplugin.png
>new file mode 100644
>index 00000000000..a4195f67d37
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/nullplugin.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panEastCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panEastCursor.png
>new file mode 100644
>index 00000000000..9c1592e5d6f
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panEastCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panIcon.png b/Source/WebKit/Platform/win/WebKit.resources/panIcon.png
>new file mode 100644
>index 00000000000..4ca8d703744
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panIcon.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panNorthCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panNorthCursor.png
>new file mode 100644
>index 00000000000..0d020dbabd6
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panNorthCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panNorthEastCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panNorthEastCursor.png
>new file mode 100644
>index 00000000000..0e896390730
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panNorthEastCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panNorthWestCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panNorthWestCursor.png
>new file mode 100644
>index 00000000000..6723f614a62
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panNorthWestCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panSouthCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panSouthCursor.png
>new file mode 100644
>index 00000000000..60cf722d1ee
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panSouthCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panSouthEastCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panSouthEastCursor.png
>new file mode 100644
>index 00000000000..415aa633b51
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panSouthEastCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panSouthWestCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panSouthWestCursor.png
>new file mode 100644
>index 00000000000..8dc5cdc584b
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panSouthWestCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/panWestCursor.png b/Source/WebKit/Platform/win/WebKit.resources/panWestCursor.png
>new file mode 100644
>index 00000000000..544439adc26
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/panWestCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/searchCancel.png b/Source/WebKit/Platform/win/WebKit.resources/searchCancel.png
>new file mode 100644
>index 00000000000..49f3f4710fb
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/searchCancel.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/searchCancelPressed.png b/Source/WebKit/Platform/win/WebKit.resources/searchCancelPressed.png
>new file mode 100644
>index 00000000000..b699d817116
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/searchCancelPressed.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/searchMagnifier.png b/Source/WebKit/Platform/win/WebKit.resources/searchMagnifier.png
>new file mode 100644
>index 00000000000..f9b8caef7e1
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/searchMagnifier.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/searchMagnifierResults.png b/Source/WebKit/Platform/win/WebKit.resources/searchMagnifierResults.png
>new file mode 100644
>index 00000000000..9aa1b36c63a
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/searchMagnifierResults.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/textAreaResizeCorner.png b/Source/WebKit/Platform/win/WebKit.resources/textAreaResizeCorner.png
>new file mode 100644
>index 00000000000..023615e5597
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/textAreaResizeCorner.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/verticalTextCursor.png b/Source/WebKit/Platform/win/WebKit.resources/verticalTextCursor.png
>new file mode 100644
>index 00000000000..0f2877ccc32
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/verticalTextCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/zoomInCursor.png b/Source/WebKit/Platform/win/WebKit.resources/zoomInCursor.png
>new file mode 100644
>index 00000000000..feec9bcbb5f
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/zoomInCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKit.resources/zoomOutCursor.png b/Source/WebKit/Platform/win/WebKit.resources/zoomOutCursor.png
>new file mode 100644
>index 00000000000..f4a954e32be
>Binary files /dev/null and b/Source/WebKit/Platform/win/WebKit.resources/zoomOutCursor.png differ
>diff --git a/Source/WebKit/Platform/win/WebKitDLL.cpp b/Source/WebKit/Platform/win/WebKitDLL.cpp
>new file mode 100644
>index 00000000000..ff5230ebb13
>--- /dev/null
>+++ b/Source/WebKit/Platform/win/WebKitDLL.cpp
>@@ -0,0 +1,43 @@
>+/*
>+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>+ */
>+
>+#include <windows.h>
>+
>+HINSTANCE gInstance;
>+
>+STDAPI_(BOOL) DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID /*lpReserved*/)
>+{
>+    switch (ul_reason_for_call) {
>+    case DLL_PROCESS_ATTACH:
>+        gInstance = hModule;
>+        return TRUE;
>+
>+    case DLL_PROCESS_DETACH:
>+    case DLL_THREAD_ATTACH:
>+    case DLL_THREAD_DETACH:
>+        break;
>+    }
>+    return FALSE;
>+}
>diff --git a/Source/WebKit/Platform/win/resource.h b/Source/WebKit/Platform/win/resource.h
>new file mode 100644
>index 00000000000..b999de62cfb
>--- /dev/null
>+++ b/Source/WebKit/Platform/win/resource.h
>@@ -0,0 +1,44 @@
>+//{{NO_DEPENDENCIES}}
>+// Microsoft Visual C++ generated include file.
>+// Used by WebKit.rc
>+//
>+#define IDR_WEBKIT                      1
>+#define IDR_RESIZE_CORNER               2
>+#define IDR_MISSING_IMAGE               3
>+#define IDR_URL_ICON                    4
>+#define IDR_NULL_PLUGIN                 5
>+#define IDR_ZOOM_IN_CURSOR              6
>+#define IDR_ZOOM_OUT_CURSOR             7
>+#define IDR_VERTICAL_TEXT_CURSOR        8
>+#define IDR_PAN_SCROLL_ICON             9
>+#define IDR_PAN_SOUTH_CURSOR            10
>+#define IDR_PAN_NORTH_CURSOR            11
>+#define IDR_PAN_EAST_CURSOR             12
>+#define IDR_PAN_WEST_CURSOR             13
>+#define IDR_PAN_SOUTH_EAST_CURSOR       14
>+#define IDR_PAN_SOUTH_WEST_CURSOR       15
>+#define IDR_PAN_NORTH_EAST_CURSOR       16
>+#define IDR_PAN_NORTH_WEST_CURSOR       17
>+#define IDR_SEARCH_CANCEL               18
>+#define IDR_SEARCH_CANCEL_PRESSED       19
>+#define IDR_SEARCH_MAGNIFIER            20
>+#define IDR_SEARCH_MAGNIFIER_RESULTS    21
>+#define IDR_FS_VIDEO_AUDIO_VOLUME_HIGH  22
>+#define IDR_FS_VIDEO_AUDIO_VOLUME_LOW   23
>+#define IDR_FS_VIDEO_EXIT_FULLSCREEN    24
>+#define IDR_FS_VIDEO_PAUSE              25
>+#define IDR_FS_VIDEO_PLAY               26
>+#define IDC_STATIC                      -1
>+
>+#define BUILD_NUMBER                    1
>+
>+// Next default values for new objects
>+// 
>+#ifdef APSTUDIO_INVOKED
>+#ifndef APSTUDIO_READONLY_SYMBOLS
>+#define _APS_NEXT_RESOURCE_VALUE        22
>+#define _APS_NEXT_COMMAND_VALUE         40001
>+#define _APS_NEXT_CONTROL_VALUE         1000
>+#define _APS_NEXT_SYMED_VALUE           101
>+#endif
>+#endif
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index acf6775077d..bce309cbddd 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -19,6 +19,9 @@ list(APPEND WebKit_SOURCES
>     Platform/win/LoggingWin.cpp
>     Platform/win/ModuleWin.cpp
>     Platform/win/SharedMemoryWin.cpp
>+    Platform/win/WebKitDLL.cpp
>+
>+    Platform/win/WebKit.resources/WebKit.rc
> 
>     Shared/win/ChildProcessMainWin.cpp
>     Shared/win/NativeWebKeyboardEventWin.cpp
>@@ -90,8 +93,10 @@ add_custom_command(
> )
> 
> list(APPEND WebKit_INCLUDE_DIRECTORIES
>+    "${DERIVED_SOURCES_DIR}/include"
>     "${WEBKIT_DIR}/NetworkProcess/win"
>     "${WEBKIT_DIR}/Platform/classifier"
>+    "${WEBKIT_DIR}/Platform/win"
>     "${WEBKIT_DIR}/PluginProcess/win"
>     "${WEBKIT_DIR}/Shared/API/c/win"
>     "${WEBKIT_DIR}/Shared/CoordinatedGraphics"
>diff --git a/Source/WebKit/WebProcess/win/WebProcessWin.cpp b/Source/WebKit/WebProcess/win/WebProcessWin.cpp
>index 173951f5e61..d6af44ba7e7 100644
>--- a/Source/WebKit/WebProcess/win/WebProcessWin.cpp
>+++ b/Source/WebKit/WebProcess/win/WebProcessWin.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -26,13 +26,81 @@
> #include "config.h"
> #include "WebProcess.h"
> 
>+#include "resource.h"
>+
> #include <WebCore/SharedBuffer.h>
> 
> using namespace WebCore;
> 
>+extern HINSTANCE gInstance;
>+
> WTF_EXPORT RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
> {
>-    return 0;
>+    int idr;
>+    // temporary hack to get resource id
>+    if (!strcmp(name, "textAreaResizeCorner"))
>+        idr = IDR_RESIZE_CORNER;
>+    else if (!strcmp(name, "missingImage"))
>+        idr = IDR_MISSING_IMAGE;
>+    else if (!strcmp(name, "nullPlugin"))
>+        idr = IDR_NULL_PLUGIN;
>+    else if (!strcmp(name, "panIcon"))
>+        idr = IDR_PAN_SCROLL_ICON;
>+    else if (!strcmp(name, "panSouthCursor"))
>+        idr = IDR_PAN_SOUTH_CURSOR;
>+    else if (!strcmp(name, "panNorthCursor"))
>+        idr = IDR_PAN_NORTH_CURSOR;
>+    else if (!strcmp(name, "panEastCursor"))
>+        idr = IDR_PAN_EAST_CURSOR;
>+    else if (!strcmp(name, "panWestCursor"))
>+        idr = IDR_PAN_WEST_CURSOR;
>+    else if (!strcmp(name, "panSouthEastCursor"))
>+        idr = IDR_PAN_SOUTH_EAST_CURSOR;
>+    else if (!strcmp(name, "panSouthWestCursor"))
>+        idr = IDR_PAN_SOUTH_WEST_CURSOR;
>+    else if (!strcmp(name, "panNorthEastCursor"))
>+        idr = IDR_PAN_NORTH_EAST_CURSOR;
>+    else if (!strcmp(name, "panNorthWestCursor"))
>+        idr = IDR_PAN_NORTH_WEST_CURSOR;
>+    else if (!strcmp(name, "searchMagnifier"))
>+        idr = IDR_SEARCH_MAGNIFIER;
>+    else if (!strcmp(name, "searchMagnifierResults"))
>+        idr = IDR_SEARCH_MAGNIFIER_RESULTS;
>+    else if (!strcmp(name, "searchCancel"))
>+        idr = IDR_SEARCH_CANCEL;
>+    else if (!strcmp(name, "searchCancelPressed"))
>+        idr = IDR_SEARCH_CANCEL_PRESSED;
>+    else if (!strcmp(name, "zoomInCursor"))
>+        idr = IDR_ZOOM_IN_CURSOR;
>+    else if (!strcmp(name, "zoomOutCursor"))
>+        idr = IDR_ZOOM_OUT_CURSOR;
>+    else if (!strcmp(name, "verticalTextCursor"))
>+        idr = IDR_VERTICAL_TEXT_CURSOR;
>+    else if (!strcmp(name, "fsVideoAudioVolumeHigh"))
>+        idr = IDR_FS_VIDEO_AUDIO_VOLUME_HIGH;
>+    else if (!strcmp(name, "fsVideoAudioVolumeLow"))
>+        idr = IDR_FS_VIDEO_AUDIO_VOLUME_LOW;
>+    else if (!strcmp(name, "fsVideoExitFullscreen"))
>+        idr = IDR_FS_VIDEO_EXIT_FULLSCREEN;
>+    else if (!strcmp(name, "fsVideoPause"))
>+        idr = IDR_FS_VIDEO_PAUSE;
>+    else if (!strcmp(name, "fsVideoPlay"))
>+        idr = IDR_FS_VIDEO_PLAY;
>+    else
>+        return nullptr;
>+
>+    HRSRC resInfo = FindResource(gInstance, MAKEINTRESOURCE(idr), L"PNG");
>+    if (!resInfo)
>+        return nullptr;
>+    HANDLE res = LoadResource(gInstance, resInfo);
>+    if (!res)
>+        return nullptr;
>+    void* resource = LockResource(res);
>+    if (!resource)
>+        return nullptr;
>+    unsigned size = SizeofResource(gInstance, resInfo);
>+
>+    return WebCore::SharedBuffer::create(reinterpret_cast<const char*>(resource), size);
> }
> 
> namespace WebKit {

Actions: View | Formatted Diff | Diff

Attachments on bug 188175: 346547 | 346550 | 346565 | 417976 | 464978