Changeset 94859 in webkit
- Timestamp:
- Sep 9, 2011 9:58:11 AM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r94847 r94859 1 2011-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 1 22 2011-09-09 Martin Kosiba <mkosiba@chromium.org> 2 23 -
trunk/Source/WebKit/chromium/WebKit.gyp
r94604 r94859 90 90 ], 91 91 'sources': [ 92 'public/android/WebSandboxSupport.h', 93 'public/android/WebThemeEngine.h', 92 94 'public/gtk/WebInputEventFactory.h', 93 95 'public/linux/WebFontRendering.h', … … 705 707 ], 706 708 }], 709 ['OS=="android"', { 710 'include_dirs': [ 711 'public/android', 712 ], 713 }], 707 714 ['OS=="mac"', { 708 715 'include_dirs': [ -
trunk/Source/WebKit/chromium/src/PlatformSupport.cpp
r94504 r94859 74 74 #if OS(DARWIN) 75 75 #include "mac/WebThemeEngine.h" 76 #elif OS(UNIX) 76 #elif OS(UNIX) && !OS(ANDROID) 77 77 #include "linux/WebThemeEngine.h" 78 78 #include "WebFontInfo.h" 79 79 #include "WebFontRenderStyle.h" 80 #elif OS(ANDROID) 81 #include "android/WebThemeEngine.h" 80 82 #endif 81 83 … … 462 464 String PlatformSupport::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale) 463 465 { 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 464 471 if (webKitPlatformSupport()->sandboxSupport()) 465 472 return webKitPlatformSupport()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters, preferredLocale); … … 470 477 471 478 return WebString(); 479 #endif 472 480 } 473 481 474 482 void PlatformSupport::getRenderStyleForStrike(const char* font, int sizeAndStyle, FontRenderStyle* result) 475 483 { 484 #if !OS(ANDROID) 476 485 WebFontRenderStyle style; 477 486 … … 482 491 483 492 style.toFontRenderStyle(result); 493 #endif 484 494 } 485 495 #endif -
trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp
r94613 r94859 164 164 #include <wtf/CurrentTime.h> 165 165 166 #if OS(UNIX) && !OS(DARWIN) 166 #if OS(UNIX) && !OS(DARWIN) && !OS(ANDROID) 167 167 #include <gdk/gdk.h> 168 168 #endif
Note: See TracChangeset
for help on using the changeset viewer.