Commits · d96133ae58f7b1b92ee654dbcf47a62eb16c0fe1 · halo / external_chromium_org

08 Sep, 2014 1 commit
- Re-generate .mk files after JNI generator changes. · a3be64ca
  Marcin Kosiba authored 10 years ago
```
BUG: 16870075
Change-Id: I7d1971f2862fa27ae4469519a81029f85eab38bb
```
  a3be64ca
06 Aug, 2014 1 commit

Merge from Chromium at DEPS revision 37.0.2062.68 · 9a3a4bc9

Bo Liu authored 10 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ibe33648eea4a13ac1d5c222ff349c507f2cac617

9a3a4bc9

01 Jul, 2014 1 commit
- Merge from Chromium at DEPS revision 37.0.2062.10 · 2f22f038
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I7a3a1838fe1d01e3d29886fc52aa980c2c3f2783
```
  2f22f038
25 Jun, 2014 1 commit
- Merge from Chromium at DEPS revision 278856 · 6d86b770
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
```
  6d86b770
20 Jun, 2014 1 commit
- Merge from Chromium at DEPS revision 278205 · f8ee788a
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
```
  f8ee788a
09 Jun, 2014 1 commit
- Merge from Chromium at DEPS revision 275586 · 46d4c2bc
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
```
  46d4c2bc
03 Jun, 2014 2 commits
- Merge from Chromium at DEPS revision 36.0.1985.36 · dd67b179
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ie37809501a899c2ffa38375f4c2d06248dfcc8ac
```
  dd67b179
- Merge from Chromium at DEPS revision 273901 · cedac228
  Torne (Richard Coles) authored 10 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
```
  cedac228
14 May, 2014 1 commit
- Merge from Chromium at DEPS revision 269336 · 010d83a9
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
```
  010d83a9
01 May, 2014 1 commit

Merge from Chromium at DEPS revision 267519 · 5c02ac1a

Bo Liu authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25

5c02ac1a

24 Apr, 2014 1 commit

Merge from Chromium at DEPS revision 265802 · 0529e5d0

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281

0529e5d0

16 Apr, 2014 1 commit

Merge from Chromium at DEPS revision 263965 · a02191e0

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf

a02191e0

10 Apr, 2014 1 commit

Merge from Chromium at DEPS revision 262940 · c5cede9a

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1

c5cede9a

03 Apr, 2014 1 commit

Merge from Chromium at DEPS revision 261286 · e5d81f57

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

e5d81f57

01 Apr, 2014 1 commit

Merge from Chromium at DEPS revision 260540 · 4ad1aa43

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588

4ad1aa43

31 Mar, 2014 1 commit

Merge from Chromium at DEPS revision 260458 · effb81e5

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022

effb81e5

21 Mar, 2014 1 commit
- Merge from Chromium at DEPS revision 258528 · 23730a6e
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
```
  23730a6e
18 Mar, 2014 1 commit
- Merge from Chromium at DEPS revision 257591 · a1401311
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
```
  a1401311
17 Mar, 2014 1 commit

Revert "Revert "Use system skia for WebView."" · 8a6e767a

Ben Murdoch authored 11 years ago

Build issues should now be resolved.

This reverts commit 4d135918.

Change-Id: I974092865acb959febf4516c25f570e6e249cb49

8a6e767a

15 Mar, 2014 1 commit

Revert "Use system skia for WebView." · 4d135918

Bart Sears authored 11 years ago

This CL was causing some build failures in klp-modular-dev and
klp-volantis-dev.  Reverting while we investigate.

This reverts commit 63baaa13.

Change-Id: Ib3c84431ee294efbb243387afde820ca33082186

4d135918

14 Mar, 2014 1 commit

Use system skia for WebView. · 63baaa13

Torne (Richard Coles) authored 11 years ago

Define use_system_skia when building for WebView, and update makefiles.

Bug: 13246311
Change-Id: Ie0b28dbbac7cc8e6afca04bc83af8aad6e46ebb8

63baaa13

13 Mar, 2014 2 commits

Revert "Use system skia for WebView." · 394e20cd
Ben Murdoch authored 11 years ago
```
This reverts commit f0d11593.

Change-Id: I7ab7c17d5eb21d9e75a512ea5bb152d020631496
```
394e20cd

Use system skia for WebView. · f0d11593

Torne (Richard Coles) authored 11 years ago

Define use_system_skia when building for WebView, and update makefiles.

Bug: 13246311
Change-Id: I1510c0684ea6388048b88e52e42e8ad5ffa35caf

f0d11593

21 Feb, 2014 1 commit
- Merge from Chromium at DEPS revision 251904 · 5d1f7b1d
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
```
  5d1f7b1d
02 Jan, 2014 1 commit
- Merge from Chromium at DEPS revision 241094 · d57369da
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ic69269a3a00901711ccf4510285c238b75be4236
```
  d57369da
18 Dec, 2013 1 commit
- Merge from Chromium at DEPS revision 240154 · a3f6a49a
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
```
  a3f6a49a
28 Nov, 2013 1 commit
- Merge from Chromium at DEPS revision 237746 · f2477e01
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
```
  f2477e01
31 Oct, 2013 1 commit
- Merge from Chromium at DEPS revision 232015 · 1e9bf3e0
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
```
  1e9bf3e0
22 Oct, 2013 1 commit
- Merge from Chromium at DEPS revision 230120 · 8bcbed89
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
```
  8bcbed89
18 Oct, 2013 1 commit
- Merge from Chromium at DEPS revision 228962 · 4e180b6a
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
```
  4e180b6a
26 Sep, 2013 1 commit
- Merge from Chromium at DEPS revision 225410 · 68043e1e
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
```
  68043e1e
19 Sep, 2013 1 commit
- Merge from Chromium at DEPS revision 224184 · d0247b1b
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
```
  d0247b1b
30 Aug, 2013 2 commits

The generated makefiles for printing · b0a4528b

Selim Gurun authored 11 years ago

Bug: 10507857

These are the machine generated makefiles for
 I4535846d2dfe52c8739cd428a13f2213d5ec786e

Change-Id: I9fea4b7b55be536f1242c14f5c79ce7797b9c5e2

b0a4528b

Merge from Chromium at DEPS revision r220549 · 424c4d7b
Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
```
424c4d7b

23 Aug, 2013 2 commits
- Merge from Chromium at DEPS revision r219274 · 3551c9c8
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
```
  3551c9c8
- Merge from Chromium at DEPS revision 30.0.1599.18 · 68dded96
  Torne (Richard Coles) authored 11 years ago
```
This commit was generated by merge_to_master.py.

Change-Id: I66bd7deb92b4f0bc822e0e444f03da83e30a4d8b
```
  68dded96
20 Aug, 2013 2 commits

A first cut to printing. · 5d5be6dc

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

12 Aug, 2013 1 commit

Merge from Chromium at DEPS revision r216972 · ba5b9a64

Ben Murdoch authored 11 years ago

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd

ba5b9a64

11 Aug, 2013 1 commit

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