| d0825bca7fe65beaee391d30da42e937db621564 |
|
02-Feb-2010 |
Steve Block <steveblock@google.com> |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| f912b6f62505f60109e7300787c93111dbd70560 |
|
17-Dec-2009 |
Steve Block <steveblock@google.com> |
Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.
Skia is used by Chromium, which defines PLATFORM(SKIA).
Android also uses Skia, but currently defines PLATFORM(SGL) to account for
platform-specific differences between Android and Chromum.
We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL).
Platform-specific differences are achieved with PLATFORM(ANDROID) guards.
This reduces our diff with webkit.org.
Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 3f252f84468859d129a8c6a9302412d2e6e5a3fa |
|
09-Oct-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf |
|
08-Oct-2009 |
Steve Block <steveblock@google.com> |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 |
|
19-Aug-2009 |
Andrei Popescu <andreip@google.com> |
Revert "Merge WebKit r47420"
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| d227fc870c7a697500a3c900c31baf05fb9a8524 |
|
18-Aug-2009 |
Ben Murdoch <benm@google.com> |
Merge WebKit r47420
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 95e3d862bbab761f8caaf1d1b54065f67b9a5148 |
|
12-Aug-2009 |
Nicolas Roard <nicolas@android.com> |
Fix merges and add #if PLATFORM(ANDROID)
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 |
|
11-Aug-2009 |
Ben Murdoch <benm@google.com> |
Merge in WebKit r47029.
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 5f1ab04193ad0130ca8204aadaceae083aca9881 |
|
17-Jun-2009 |
Feng Qian <fqian@google.com> |
Get WebKit r44544.
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| ec1dd9995d33d4d707adc024a3d0e4bef6e48cee |
|
25-Mar-2009 |
Mike Reed <> |
Automated import from //branches/master/...@142337,142337
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 635860845790a19bf50bbc51ba8fb66a96dde068 |
|
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 648161bb0edfc3d43db63caed5cc5213bc6cb78f |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| 9364f22aed35e1a1e9d07c121510f80be3ab0502 |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/external/webkit/WebCore/platform/graphics/ImageSource.h
|
| d8543bb6618c17b12da906afa77d216f58cf4058 |
|
12-Jan-1970 |
Upstream <upstream-import@none> |
external/webkit r30707
/external/webkit/WebCore/platform/graphics/ImageSource.h
|