Changeset 96233 in webkit
- Timestamp:
- Sep 28, 2011 10:36:03 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r96231 r96233 1 2011-09-28 Fady Samuel <fsamuel@chromium.org> 2 3 [Chromium] Seperate GTK specific Gyp rules from X11 Gyp rules 4 https://bugs.webkit.org/show_bug.cgi?id=68936 5 6 Reviewed by Tony Chang. 7 8 Chromium need to be built without Gtk for future version of ChromiumOS. 9 10 * WebCore.gyp/WebCore.gyp: 11 1 12 2011-09-28 Tom Sepez <tsepez@chromium.org> 2 13 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r95934 r96233 1134 1134 ], 1135 1135 }], 1136 [' toolkit_uses_gtk== 1', {1136 ['use_x11 == 1', { 1137 1137 'dependencies': [ 1138 1138 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', 1139 '<(chromium_src_dir)/build/linux/system.gyp:gtk',1140 1139 ], 1141 1140 'export_dependent_settings': [ 1142 1141 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', 1143 '<(chromium_src_dir)/build/linux/system.gyp:gtk',1144 1142 ], 1145 1143 'direct_dependent_settings': { … … 1150 1148 ], 1151 1149 }, 1150 }], 1151 ['toolkit_uses_gtk == 1', { 1152 'dependencies': [ 1153 '<(chromium_src_dir)/build/linux/system.gyp:gtk', 1154 ], 1155 'export_dependent_settings': [ 1156 '<(chromium_src_dir)/build/linux/system.gyp:gtk', 1157 ], 1152 1158 }], 1153 1159 ['OS=="linux"', { … … 1368 1374 ], 1369 1375 'conditions': [ 1370 [' toolkit_uses_gtk== 1', {1376 ['use_x11 == 1', { 1371 1377 'sources/': [ 1372 1378 # Cherry-pick files excluded by the broader regular expressions above. 1373 ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'],1374 1379 ['include', 'platform/graphics/chromium/ComplexTextControllerLinux\\.cpp$'], 1375 1380 ['include', 'platform/graphics/chromium/FontCacheLinux\\.cpp$'], … … 1378 1383 ['include', 'platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'], 1379 1384 ], 1380 }], 1381 ['toolkit_uses_gtk==1 or OS=="android"', { 1385 }, { # use_x11==0 1386 'sources/': [ 1387 ['exclude', 'Linux\\.cpp$'], 1388 ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], 1389 ], 1390 }], 1391 ['toolkit_uses_gtk == 1', { 1392 'sources/': [ 1393 # Cherry-pick files excluded by the broader regular expressions above. 1394 ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'], 1395 ], 1396 }, { # toolkit_uses_gtk==0 1397 'sources/': [ 1398 ['exclude', 'Gtk\\.cpp$'], 1399 ], 1400 }], 1401 ['use_x11==1 or OS=="android"', { 1382 1402 'dependencies': [ 1383 1403 '<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz', … … 1519 1539 ], 1520 1540 }], 1521 ['toolkit_uses_gtk == 0', { 1522 'sources/': [ 1523 ['exclude', '(Gtk|Linux)\\.cpp$'], 1524 ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], 1525 ], 1526 }], 1527 ['toolkit_uses_gtk == 0 and (OS!="mac" or use_skia==0)', { 1541 ['use_x11 == 0 and (OS!="mac" or use_skia==0)', { 1528 1542 'sources/': [ 1529 1543 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], … … 1624 1638 'cflags': ['-Wno-uninitialized'], 1625 1639 }], 1640 ['use_x11 == 0', { 1641 'sources/': [ 1642 ['exclude', 'Linux\\.cpp$'], 1643 ], 1644 }], 1626 1645 ['toolkit_uses_gtk == 0', { 1627 1646 'sources/': [ 1628 ['exclude', ' (Gtk|Linux)\\.cpp$'],1647 ['exclude', 'Gtk\\.cpp$'], 1629 1648 ], 1630 1649 }], … … 1755 1774 'cflags': ['-Wno-uninitialized'], 1756 1775 }], 1776 ['use_x11 == 0', { 1777 'sources/': [ 1778 ['exclude', 'Linux\\.cpp$'], 1779 ], 1780 }], 1757 1781 ['toolkit_uses_gtk == 0', { 1758 1782 'sources/': [ 1759 ['exclude', ' (Gtk|Linux)\\.cpp$'],1783 ['exclude', 'Gtk\\.cpp$'], 1760 1784 ], 1761 1785 }], -
trunk/Source/WebKit/chromium/ChangeLog
r96104 r96233 1 2011-09-28 Fady Samuel <fsamuel@chromium.org> 2 3 [Chromium] Seperate GTK specific Gyp rules from X11 Gyp rules 4 https://bugs.webkit.org/show_bug.cgi?id=68936 5 6 Reviewed by Tony Chang. 7 8 * WebKit.gyp: 9 * public/gtk/WebFontInfo.h: 10 * public/linux/WebFontInfo.h: Copied from Source/WebKit/chromium/public/gtk/WebFontInfo.h. 11 1 12 2011-09-27 Sheriff Bot <webkit.review.bot@gmail.com> 2 13 -
trunk/Source/WebKit/chromium/WebKit.gyp
r95647 r96233 692 692 ], 693 693 }], 694 ['use_x11 == 1', { 695 'dependencies': [ 696 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', 697 '<(chromium_src_dir)/build/linux/system.gyp:x11', 698 ], 699 'include_dirs': [ 700 'public/x11', 701 'public/linux', 702 ], 703 }, { # else: use_x11 != 1 704 'sources/': [ 705 ['exclude', '/x11/'], 706 ['exclude', '/linux/'], 707 ], 708 }], 694 709 ['toolkit_uses_gtk == 1', { 695 710 'dependencies': [ 696 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',697 711 '<(chromium_src_dir)/build/linux/system.gyp:gtk', 698 '<(chromium_src_dir)/build/linux/system.gyp:x11',699 712 ], 700 713 'include_dirs': [ 701 'public/x11',702 714 'public/gtk', 703 'public/linux',704 715 ], 705 716 }, { # else: toolkit_uses_gtk != 1 706 717 'sources/': [ 707 718 ['exclude', '/gtk/'], 708 ['exclude', '/x11/'],709 ['exclude', '/linux/'],710 719 ], 711 720 }], … … 1122 1131 ], 1123 1132 }], 1124 [' toolkit_uses_gtk== 1', {1133 ['use_x11 == 1', { 1125 1134 'dependencies': [ 1126 1135 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', 1127 '<(chromium_src_dir)/build/linux/system.gyp:gtk',1128 ],1129 'include_dirs': [1130 'public/gtk',1131 1136 ], 1132 1137 'copies': [{ … … 1149 1154 }], 1150 1155 ], 1156 },{ # use_x11 != 1 1157 'sources/': [ 1158 ['exclude', 'Linux\\.cpp$'] 1159 ] 1160 }], 1161 ['toolkit_uses_gtk == 1', { 1162 'dependencies': [ 1163 '<(chromium_src_dir)/build/linux/system.gyp:gtk', 1164 ], 1165 'include_dirs': [ 1166 'public/gtk', 1167 ], 1151 1168 },{ # toolkit_uses_gtk != 1 1152 1169 'sources/': [ 1153 ['exclude', ' (Gtk|Linux)\\.cpp$']1170 ['exclude', 'Gtk\\.cpp$'] 1154 1171 ] 1155 1172 }], -
trunk/Source/WebKit/chromium/public/gtk/WebFontInfo.h
r95901 r96233 1 1 /* 2 * Copyright (C) 20 09Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 28 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 29 */ 30 31 #ifndef WebFontInfo_h 32 #define WebFontInfo_h 33 34 #include "../WebCString.h" 35 #include "../linux/WebFontRenderStyle.h" 36 37 #include <string.h> 38 #include <unistd.h> 39 40 namespace WebKit { 41 42 class WebFontInfo { 43 public: 44 // Return a font family which provides glyphs for the Unicode code points 45 // specified by |utf16| 46 // characters: a native-endian UTF16 string 47 // numCharacters: the number of 16-bit words in |utf16| 48 // preferredLocale: preferred locale identifier for the |characters| 49 // (e.g. "en", "ja", "zh-CN") 50 // 51 // Returns: the font family or an empty string if the request could not be 52 // satisfied. 53 WEBKIT_EXPORT static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale); 54 55 // Fill out the given WebFontRenderStyle with the user's preferences for 56 // rendering the given font at the given size. 57 // family: i.e. "Times New Roman" 58 // sizeAndStyle: 59 // 3322222222221111111111 60 // 10987654321098765432109876543210 61 // +--------------------------------+ 62 // |..............Size............IB| 63 // +--------------------------------+ 64 // I: italic flag 65 // B: bold flag 66 WEBKIT_EXPORT static void renderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle* result); 67 }; 68 69 } // namespace WebKit 70 71 #endif 30 // This file can be deleted once http://codereview.chromium.org/8054025/ 31 // gets committed in Chromium. 32 #include "../linux/WebFontInfo.h"
Note: See TracChangeset
for help on using the changeset viewer.