20087 Commits

Author SHA1 Message Date
Bart Sears
bba7b1b425 Merge "Revert "Save all kind of script tags into FontLanguage."" 2015-12-22 09:07:09 +00:00
Bart Sears
6c4c098cbd Revert "Save all kind of script tags into FontLanguage."
This reverts commit 5e995fb850c2b32631914c3815dfb421855fba9b.

Change-Id: I761e0e41906742fbe3d3ac34170af3101e18042a
2015-12-22 09:06:03 +00:00
Seigo Nonaka
96233efe4c Merge "Save all kind of script tags into FontLanguage." 2015-12-22 04:01:19 +00:00
Seigo Nonaka
5e995fb850 Save all kind of script tags into FontLanguage.
The main purpose of this CL is expanding FontLanguage to be able to
save full script tag. Previously, FontLangauge kept only limited script
tags. With this CL, FontLanguage keeps all script tags.

This CL contains the following changes:
- FontLanguage changes:
-- Moved to private directory not to be instantiated outside of Minikin.
-- Removed bool(), bits(), FontLanguage(uint32_t) methods which are no
   longer used.
-- Change the FontLanguage internal data structure.
-- Introduces script match logic.

- FontLanguages changes:
-- Moved to private directory not to be instantiated outside of Minikin.
-- This is now std::vector<FontLanguage>

- FontLanguageListCache changes:
-- Now FontLanguageListCache::getId through
   FontStyle::registerLanguageList is the only way to instantiate the
   FontLanguage.
-- Normalize input to be BCP47 compliant identifier by ICU.

Bug: 26168983
Change-Id: I8df992a6851021903478972601a9a5c9424b100c
2015-12-22 09:34:04 +09:00
Chinmay Garde
e466c7dbd5 Merge pull request #2191 from chinmaygarde/master
Add iOS implementations for MediaPlayer volume and looping setters
2015-12-16 15:25:45 -08:00
Chinmay Garde
514aa0a69f Add iOS implementations for MediaPlayer volume and looping setters 2015-12-16 14:59:17 -08:00
Chinmay Garde
15e4f080ac Merge pull request #2190 from chinmaygarde/master
Revert "Roll Skia"
2015-12-16 14:25:33 -08:00
Chinmay Garde
31889995c4 Revert "Roll Skia"
This reverts commit eeafe3a576d7f647b347ba9e8de6f2af6c565cca.
2015-12-16 14:18:58 -08:00
Jason Simmons
ed13305735 Merge pull request #2189 from jason-simmons/engine_release_1216
rev engine
2015-12-16 10:54:15 -08:00
Jason Simmons
07948337d9 rev engine 2015-12-16 10:53:54 -08:00
Jason Simmons
0f83cdc47d Merge pull request #2188 from jason-simmons/activity_pause_resume
Provide callbacks for activity pause and resume events
2015-12-16 10:27:03 -08:00
Jason Simmons
e55cf62694 Provide callbacks for activity pause and resume events 2015-12-15 18:01:36 -08:00
Seigo Nonaka
c5ec243b3a No op build should not build minikin_tests
Previous CL[1] adds module names into LOCAL_ADDITIONAL_DEPENDENCIES, but
it was wrong. LOCAL_ADDITIONAL_DEPENDENCIES only accepts file path.

However, BUILD_PREBUILT doesn't provide a file path of the installed
font. So use custom tool and LOCAL_GENERATED_SOURCES instead.

Confirmed no-op build doesn't built minikin_tests and
continuous_native_tests.zip contains all necessary files.

[1]: I7d83abc077bce4e38fd93c7d607bc7e1f7871e6b

BUG: 26197092
Change-Id: I90e80036248ae72e0e0f9c6144a259f5f96ec9ce
2015-12-15 16:11:21 -08:00
Jason Simmons
0cca3dd352 Merge pull request #2186 from jason-simmons/sound_track_volume
Add MediaPlayer methods for volume and looping
2015-12-15 12:24:04 -08:00
Jason Simmons
85a3a3a310 Merge pull request #2187 from jason-simmons/image_decode_jpeg
Check the image decoder's failed flag after obtaining the frame buffer
2015-12-15 12:23:59 -08:00
Jason Simmons
8883ada7d6 Check the image decoder's failed flag after obtaining the frame buffer
Some decoders (e.g. JPEG) do not execute the decode until the call to
frameBufferAtIndex.  If the decode fails, we should not try to return a
bitmap.
2015-12-15 11:15:00 -08:00
Jason Simmons
04ff30d78b Add MediaPlayer methods for volume and looping 2015-12-15 10:48:00 -08:00
Jason Simmons
31720a58f9 Merge pull request #2185 from jason-simmons/deps_patched_yasm
Add patched-yasm back to DEPS for use by libjpeg_turbo
2015-12-14 17:36:59 -08:00
Jason Simmons
df90dcb784 Add patched-yasm back to DEPS for use by libjpeg_turbo 2015-12-14 17:33:05 -08:00
Jason Simmons
13998be151 Merge pull request #2184 from jason-simmons/engine_release_1214a
rev engine
2015-12-14 17:00:50 -08:00
Jason Simmons
50df877592 rev engine 2015-12-14 16:58:03 -08:00
Jason Simmons
b740478cc0 Merge pull request #2183 from jason-simmons/jpeg_bug_918
Revert to libjpeg_turbo
2015-12-14 16:54:09 -08:00
Jason Simmons
784fe3dd0b Revert to libjpeg_turbo
We had switched to libjpeg, but libjpeg was failing to decode images when
built with the defines in our .gn files
2015-12-14 16:48:49 -08:00
Jason Simmons
5a32fb6334 Merge pull request #2181 from jason-simmons/engine_release_1214
rev engine
2015-12-14 10:48:03 -08:00
Jason Simmons
663cc31668 rev engine 2015-12-14 10:44:44 -08:00
Jason Simmons
f31c30297c Merge pull request #2163 from jason-simmons/sound_pool_2
In SoundPool, have the client provide stream IDs
2015-12-14 10:42:21 -08:00
Jason Simmons
d9b4f66dd1 In SoundPool, have the client provide stream IDs so future API calls aren't gated on completion of Play()
Also use an array to represent channel volumes instead of assuming two channels
2015-12-14 10:37:14 -08:00
Dan Austin
1f0d794737 Refactored unsigned long negations am: 1bbe03d215
am: b9f27a2509

* commit 'b9f27a2509241a0f2dfcf6921958dab4b14fbc42':
  Refactored unsigned long negations
2015-12-14 09:30:20 -08:00
Dan Austin
b9f27a2509 Refactored unsigned long negations
am: 1bbe03d215

* commit '1bbe03d215c9452bc9917111e63f19160cc5f56a':
  Refactored unsigned long negations
2015-12-14 09:12:42 -08:00
Ian Hickson
e5c866cd95 Merge pull request #2180 from Hixie/temp
rev engine
2015-12-11 17:52:17 -08:00
Hixie
2e2423e8e5 rev engine 2015-12-11 17:51:04 -08:00
Dan Austin
1bbe03d215 Refactored unsigned long negations
Replaced two instances of negating an unsigned long, which was
resulting in aborts from unsigned integer sanitization with the
equivalent logical not-add 1.

Bug: 25884483
Change-Id: Ic7498e0af638dcd438ce69803021d3cdc3acd4f6
2015-12-11 16:33:23 -08:00
Florian Loitsch
8e1fc82146 Add 'FlushRealTimeEvents' to window. 2015-12-11 16:11:47 -08:00
Chinmay Garde
305f524054 Merge pull request #2179 from chinmaygarde/master
Build script used by builders to package the unified Xcode project
2015-12-11 15:27:04 -08:00
Chinmay Garde
53138f9d7f Build script used by builders to package the unified Xcode project 2015-12-11 15:25:21 -08:00
Chinmay Garde
cd9be85af7 Merge pull request #2175 from chinmaygarde/master
Switch snapshotter and application runner based on Xcode target
2015-12-11 15:17:41 -08:00
Adam Barth
4d19d802a4 Merge pull request #2177 from abarth/rm_third_party_build
Remove //third_party/BUILD.gn
2015-12-11 14:24:07 -08:00
Adam Barth
d68f02607f Remove //third_party/BUILD.gn
We no longer need this hack to mux between libjpeg and libjpeg_turbo.
2015-12-11 14:13:46 -08:00
Adam Barth
ad3fb3d262 Merge pull request #2176 from abarth/roll_skia
Roll Skia
2015-12-11 14:00:28 -08:00
Adam Barth
eeafe3a576 Roll Skia 2015-12-11 13:52:58 -08:00
Chinmay Garde
4e8a9304a7 Switch snapshotter and application runner based on the Xcode target 2015-12-11 13:47:39 -08:00
Chinmay Garde
9ecd7d38cd Remove references to files in the generated directory as those are no longer added directly in an Xcode build phase 2015-12-11 13:47:39 -08:00
Chinmay Garde
34cfa1ad57 Put target specific files in their own directory and update Xcode referneces 2015-12-11 13:47:39 -08:00
Chinmay Garde
42deccf6a7 Merge pull request #2172 from chinmaygarde/master
Fix iOS builds after updates to media.mojom
2015-12-11 11:51:03 -08:00
Adam Barth
78a308410b Merge pull request #2174 from abarth/rm_re2
Remove re2
2015-12-11 11:26:05 -08:00
Adam Barth
87fc1b81f2 Remove re2
We don't use this anymore.
2015-12-11 11:24:14 -08:00
Adam Barth
95664d49a4 Merge pull request #2173 from abarth/rm_url
Remove //url
2015-12-11 11:21:37 -08:00
Adam Barth
9c3aac7c2f Remove //url
We don't use this anymore.
2015-12-11 11:20:23 -08:00
Adam Barth
1f052bf754 Merge pull request #2171 from abarth/rm_libxml
Remove libxml and modp_b64
2015-12-11 11:12:00 -08:00
Chinmay Garde
08e33cd671 Fix iOS builds after updates to media.mojom 2015-12-11 11:11:24 -08:00