Changeset 94859 in webkit


Ignore:
Timestamp:
Sep 9, 2011 9:58:11 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[Chromium] Add WebSandboxSupport and WebThemeEngine for Android.
https://bugs.webkit.org/show_bug.cgi?id=67584

Patch by Hao Zheng <zhenghao@chromium.org> on 2011-09-09
Reviewed by Steve Block.

Make src/PlatformSupport.cpp and src/WebFrameImpl.cpp compile on
Chromium port for Android.

  • WebKit.gyp:
  • public/android: Added.
  • public/android/WebSandboxSupport.h: Added.
  • public/android/WebThemeEngine.h: Added.

(WebKit::WebThemeEngine::getSize):
(WebKit::WebThemeEngine::paint):

  • src/PlatformSupport.cpp:

(WebCore::PlatformSupport::getFontFamilyForCharacters):
(WebCore::PlatformSupport::getRenderStyleForStrike):

  • src/WebFrameImpl.cpp:
Location:
trunk/Source/WebKit/chromium
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r94847 r94859  
     12011-09-09  Hao Zheng  <zhenghao@chromium.org>
     2
     3        [Chromium] Add WebSandboxSupport and WebThemeEngine for Android.
     4        https://bugs.webkit.org/show_bug.cgi?id=67584
     5
     6        Reviewed by Steve Block.
     7
     8        Make src/PlatformSupport.cpp and src/WebFrameImpl.cpp compile on
     9        Chromium port for Android.
     10
     11        * WebKit.gyp:
     12        * public/android: Added.
     13        * public/android/WebSandboxSupport.h: Added.
     14        * public/android/WebThemeEngine.h: Added.
     15        (WebKit::WebThemeEngine::getSize):
     16        (WebKit::WebThemeEngine::paint):
     17        * src/PlatformSupport.cpp:
     18        (WebCore::PlatformSupport::getFontFamilyForCharacters):
     19        (WebCore::PlatformSupport::getRenderStyleForStrike):
     20        * src/WebFrameImpl.cpp:
     21
    1222011-09-09  Martin Kosiba  <mkosiba@chromium.org>
    223
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r94604 r94859  
    9090            ],
    9191            'sources': [
     92                'public/android/WebSandboxSupport.h',
     93                'public/android/WebThemeEngine.h',
    9294                'public/gtk/WebInputEventFactory.h',
    9395                'public/linux/WebFontRendering.h',
     
    705707                    ],
    706708                }],
     709                ['OS=="android"', {
     710                    'include_dirs': [
     711                        'public/android',
     712                    ],
     713                }],
    707714                ['OS=="mac"', {
    708715                    'include_dirs': [
  • trunk/Source/WebKit/chromium/src/PlatformSupport.cpp

    r94504 r94859  
    7474#if OS(DARWIN)
    7575#include "mac/WebThemeEngine.h"
    76 #elif OS(UNIX)
     76#elif OS(UNIX) && !OS(ANDROID)
    7777#include "linux/WebThemeEngine.h"
    7878#include "WebFontInfo.h"
    7979#include "WebFontRenderStyle.h"
     80#elif OS(ANDROID)
     81#include "android/WebThemeEngine.h"
    8082#endif
    8183
     
    462464String PlatformSupport::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale)
    463465{
     466#if OS(ANDROID)
     467    // FIXME: We do not use fontconfig on Android, so use simple logic for now.
     468    // https://bugs.webkit.org/show_bug.cgi?id=67587
     469    return WebString("Arial");
     470#else
    464471    if (webKitPlatformSupport()->sandboxSupport())
    465472        return webKitPlatformSupport()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters, preferredLocale);
     
    470477
    471478    return WebString();
     479#endif
    472480}
    473481
    474482void PlatformSupport::getRenderStyleForStrike(const char* font, int sizeAndStyle, FontRenderStyle* result)
    475483{
     484#if !OS(ANDROID)
    476485    WebFontRenderStyle style;
    477486
     
    482491
    483492    style.toFontRenderStyle(result);
     493#endif
    484494}
    485495#endif
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r94613 r94859  
    164164#include <wtf/CurrentTime.h>
    165165
    166 #if OS(UNIX) && !OS(DARWIN)
     166#if OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
    167167#include <gdk/gdk.h>
    168168#endif
Note: See TracChangeset for help on using the changeset viewer.