Commits · 5d5be6dc8a24d729a037d5b76e0d1fa711ece471 · halo / external_chromium_org

20 Aug, 2013 3 commits

Selim Gurun authored 11 years ago

Bug: 10190508

Very basic PDF conversion to a single page is working. The
purpose of this patch is to create the plumbing.

Change-Id: I506b3d282115b7bcd5fa1fd4040c0e37b9dc4648

5d5be6dc

Enable use_system_skia. · 1ec45469

Torne (Richard Coles) authored 11 years ago

Enable the use_system_skia flag for the WebView build.

Bug: 10402995
Change-Id: I46c8d16daf88b691c8d3faf95b86bd221d1c5477

1ec45469

Cherrypick r218021: Android WebView: build fixes for use_system_skia. · 678c4834

torne@chromium.org authored 11 years ago

Cherrypick r218021 from M30 branch.

> The skia shim headers were not being included at the front of the path
> because of a gyp processing issue, causing it to pick up the bundled
> headers instead by mistake; fix the gyp file.
>
> Also, some of the chromium code depends on non-public headers; add the
> required include path for this to work until we can fix the code.
>
> BUG=263818,274425
>
> Review URL: https://chromiumcodereview.appspot.com/23064007
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218021 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 10402995
Change-Id: I092bac8f3b39d816d797809f414a34712277008d

678c4834

14 Aug, 2013 2 commits

Record Chromium merge at DEPS revision r217147 · 30ed19a6

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ic154493f9a2328a23ad5584b1a34f47e84c31b63

30ed19a6

Merge from Chromium at DEPS revision r217147 · f968bfd8

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I503e836e213a81043e68c176ac95bb385b43ef2b

f968bfd8

13 Aug, 2013 2 commits

Record Chromium merge at DEPS revision r217092 · 9af2cb2b

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I48d0cb01f73af554afc55e9d07c61326684ca3f5

9af2cb2b

Merge from Chromium at DEPS revision r217092 · a031efa9

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I91a8ab76ffb254434b2a39ea11e0b6a0e34b9159

a031efa9

12 Aug, 2013 3 commits

Cherry pick https://codereview.chromium.org/22882002/ PS1 · 60845df7
Ben Murdoch authored 11 years ago
```
Cherry pick WebView stability fix.

Bug: 10143869
Change-Id: I07e6db554e595165a343abfd02d5c0a214724c11
```
60845df7

Record Chromium merge at DEPS revision r216972 · c87cee15

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I192785ee317edb954abcf4d2e19f2ae30e57c440

c87cee15

Merge from Chromium at DEPS revision r216972 · 3d4dfb6f

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I5882510871bff373c07cfc204aafc92f938f7b72

3d4dfb6f

11 Aug, 2013 2 commits

Record Chromium merge at DEPS revision r216896 · a826e305

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ibfefe06d5e82b01623e994482fd9b08379b6a063

a826e305

Merge from Chromium at DEPS revision r216896 · 4311e82a

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I595ee04895ccfeb752d5798668ae0cd67346dd2b

4311e82a

08 Aug, 2013 3 commits

Cherry pick of https://codereview.chromium.org/22486004/ PS5 · a1210631
Ben Murdoch authored 11 years ago
```
Chromium stability fixes.

Bug: 10144150

Change-Id: I2f552180deca1c1caefe0768eeae1619dc9ea4b1
```
a1210631

Record Chromium merge at DEPS revision r216370 · ba1358b4

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I2901278ee9a4f89bb76660c3baca762a45c8dfa9

ba1358b4

Merge from Chromium at DEPS revision r216370 · bb1529ce

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113

bb1529ce

07 Aug, 2013 3 commits
- Downstream Workaround for Qualcomm Bug 10205015 · c9550557
  Jonathan Dixon authored 11 years ago
```
Change-Id: Ib6c2c314e57be5b23acd60cee2e9f4ea6598ab7e
```
  c9550557
- Record Chromium merge at DEPS revision r216133 · 1929f204
  Ben Murdoch authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I4c0019fe95704ebdcfb79c3c656214fbac4a4add
```
  1929f204
- Merge from Chromium at DEPS revision r216133 · 3240926e
  Ben Murdoch authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
```
  3240926e
06 Aug, 2013 2 commits

Record Chromium merge at DEPS revision r215849 · 3b21a50e

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I8d6783d8342385fc08418f1ed7b5429a1a3113d8

3b21a50e

Merge from Chromium at DEPS revision r215849 · 2385ea39

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4

2385ea39

05 Aug, 2013 2 commits
- Record Chromium merge at DEPS revision r215573 · 8ee924b7
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: If1ec39fbbef05ea308ad168f8ae086a94a7871fb
```
  8ee924b7
- Merge from Chromium at DEPS revision r215573 · a36e5920
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
```
  a36e5920
01 Aug, 2013 3 commits
- Merge "Bump up the fallback OS version number to 4.3.0" · 34378da0
  Jonathan Dixon authored 11 years ago
  
  34378da0
- Bump up the fallback OS version number to 4.3.0 · 8abddd84
  Jonathan Dixon authored 11 years ago
```
Bug: 10124535,10013600

Patched in from upstream chromium
https://codereview.chromium.org/20752003/ PS1

Change-Id: I411221340a7a6bf882cf57105cb625193cb158cc
```
  8abddd84
- Cherry pick of https://codereview.chromium.org/19522006 · 28390f6b
  Ben Murdoch authored 11 years ago
```
Stability fixes for Chromium WebView.

Bug:9915533

Change-Id: If5730b3f0c79b1ddd56bce3a2903531632ea0bc6
```
  28390f6b
31 Jul, 2013 4 commits

Record Chromium merge at DEPS revision r214456 · 226ac258

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I13e071565d077316c06573fcc89ee8d7c604e811

226ac258

Merge from Chromium at DEPS revision r214456 · fb250657

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964

fb250657

Record Chromium merge at DEPS revision r214391 · 8b098b9d

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I7f52e17380064cf0553a36811581900d3ae3e02d

8b098b9d

Merge from Chromium at DEPS revision r214391 · d3868032

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5

d3868032

30 Jul, 2013 2 commits

Record Chromium merge at DEPS revision r214332 · e5b4422c

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I9c3f42d3ff38b7a63c3c4c0a9b80261b683260e6

e5b4422c

Merge from Chromium at DEPS revision r214332 · 558790d6

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1

558790d6

26 Jul, 2013 2 commits

Record Chromium merge at DEPS revision r213780 · 8643c35e

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: If9a38f8061e98d65520548cdf44364926e37cece

8643c35e

Merge from Chromium at DEPS revision r213780 · 58e6fbe4

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e

58e6fbe4

25 Jul, 2013 2 commits

Record Chromium merge at DEPS revision r213605 · 0e2fcb85

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ibf258ec30e096fd0c929926dfb9c23b4545ecf0e

0e2fcb85

Merge from Chromium at DEPS revision r213605 · bbcdd45c

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213

bbcdd45c

24 Jul, 2013 2 commits

Record Chromium merge at DEPS revision r213371 · 8a142c18

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I14790f7a1ff6a133ff3d83b9089d400889285efb

8a142c18

Merge from Chromium at DEPS revision r213371 · a3f7b4e6

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf

a3f7b4e6

23 Jul, 2013 2 commits

Record Chromium merge at DEPS revision r213057 · d4336a7d

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ic9098fce4aea3fce1b1768f45594b60d265e9d74

d4336a7d

Merge from Chromium at DEPS revision r213057 · ca12bfac

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388

ca12bfac

18 Jul, 2013 1 commit

Record Chromium merge at DEPS revision r212225 · fcb3e05b

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I092fbca7c43fd5b766bc57f8a6e65d859427ebe9

fcb3e05b