Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge "Add layer clip check to hide handles when not visible." | George Mount | 2012-06-12 | 1 | -0/+23 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Add layer clip check to hide handles when not visible. | George Mount | 2012-06-07 | 1 | -0/+23 | |
* | | | | | | | Merge "Fix edit text capturing selection." | George Mount | 2012-06-12 | 2 | -23/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix edit text capturing selection. | George Mount | 2012-06-06 | 2 | -23/+24 | |
* | | | | | | | | am dc9e0296: (-s ours) am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "D... | Geremy Condra | 2012-06-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit ... | Geremy Condra | 2012-06-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit plumbing for file origi... | Geremy Condra | 2012-06-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| | | * | | | | | | Merge "DO NOT MERGE Add webkit plumbing for file origin policy" | Geremy Condra | 2012-06-11 | 1 | -0/+14 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | DO NOT MERGE Add webkit plumbing for file origin policy | Selim Gurun | 2012-06-06 | 1 | -0/+14 | |
| | | |/ / / / / / | ||||||
* | | | | | | | | | am f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros... | Selim Gurun | 2012-06-11 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-dev | Selim Gurun | 2012-06-11 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-dev | Selim Gurun | 2012-06-11 | 1 | -2/+0 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | | * | | | | | | Remove forgotten CHROME_NETWORK_STACK macros | Selim Gurun | 2012-06-08 | 1 | -2/+0 | |
* | | | | | | | | | am 42fe1d5b: Reconcile with jb-release | The Android Open Source Project | 2012-06-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Reconcile with jb-release | The Android Open Source Project | 2012-06-11 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-08 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | ||||||
* | | | \ \ \ \ \ \ \ | am a2cd3028: am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when scro... | John Reck | 2012-06-11 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when scrolling a rende... | John Reck | 2012-06-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "Disable dispatchFakeMouseMoveEvent when scrolling a render layer" into... | John Reck | 2012-06-11 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Disable dispatchFakeMouseMoveEvent when scrolling a render layer | John Reck | 2012-06-08 | 1 | -0/+2 | |
| | | |/ / / / / / / | ||||||
* | | | | | | | | | | Merge "Support separation interface and implementations of WebView classes" | Jonathan Dixon | 2012-06-08 | 1 | -33/+32 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Support separation interface and implementations of WebView classes | Jesse Greenwald | 2012-06-01 | 1 | -33/+32 | |
* | | | | | | | | | | | am fa20fc4f: am 6cb37392: Merge "Make sure we gather the textures before any ... | Teng-Hui Zhu | 2012-06-08 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | am 6cb37392: Merge "Make sure we gather the textures before any prepare work"... | Teng-Hui Zhu | 2012-06-08 | 1 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "Make sure we gather the textures before any prepare work" into jb-dev | Teng-Hui Zhu | 2012-06-08 | 1 | -3/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Make sure we gather the textures before any prepare work | Teng-Hui Zhu | 2012-06-07 | 1 | -3/+4 | |
* | | | | | | | | | | | am 334b4068: am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed in... | John Reck | 2012-06-07 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed in ptr" into jb... | John Reck | 2012-06-07 | 1 | -6/+7 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge "Switch stopGL and destroy to use a passed in ptr" into jb-dev | John Reck | 2012-06-07 | 1 | -6/+7 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Switch stopGL and destroy to use a passed in ptr | John Reck | 2012-06-07 | 1 | -6/+7 | |
* | | | | | | | | | | | | am dda8bbad: am b44cdc90: Merge "Add fast drawing path for repeat background ... | Teng-Hui Zhu | 2012-06-07 | 9 | -49/+253 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am b44cdc90: Merge "Add fast drawing path for repeat background image." into ... | Teng-Hui Zhu | 2012-06-07 | 9 | -49/+253 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Add fast drawing path for repeat background image." into jb-dev | Teng-Hui Zhu | 2012-06-07 | 9 | -49/+253 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Add fast drawing path for repeat background image. | Teng-Hui Zhu | 2012-06-07 | 9 | -49/+253 | |
* | | | | | | | | | | | | am 39a00d5f: am 2de717d2: Merge "Fix IFrame max scroll" into jb-dev | John Reck | 2012-06-07 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 2de717d2: Merge "Fix IFrame max scroll" into jb-dev | John Reck | 2012-06-07 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Fix IFrame max scroll" into jb-dev | John Reck | 2012-06-07 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Fix IFrame max scroll | John Reck | 2012-06-07 | 1 | -2/+2 | |
| | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | Merge "Revert "Revert "Fix hardcoded font path. Allow adding new font path th... | Billy Hewlett | 2012-06-07 | 1 | -49/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Revert "Revert "Fix hardcoded font path. Allow adding new font path thru Skia... | Billy Hewlett | 2012-06-07 | 1 | -49/+17 | |
* | | | | | | | | | | | am 75b48cb1: (-s ours) am 4ec0a85e: Merge "DO NOT MERGE Use scoped_refptr\'s ... | Selim Gurun | 2012-06-07 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | am 4ec0a85e: Merge "DO NOT MERGE Use scoped_refptr\'s rather than naked ptrs.... | Selim Gurun | 2012-06-07 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "DO NOT MERGE Use scoped_refptr's rather than naked ptrs." into jb-dev | Selim Gurun | 2012-06-07 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | DO NOT MERGE Use scoped_refptr's rather than naked ptrs. | Selim Gurun | 2012-06-07 | 1 | -5/+5 | |
* | | | | | | | | | | | | am 110b238c: am 0d4f6046: Remove unnecessary Android code from hitTestForLayer | John Reck | 2012-06-07 | 2 | -32/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am 0d4f6046: Remove unnecessary Android code from hitTestForLayer | John Reck | 2012-06-07 | 2 | -32/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Remove unnecessary Android code from hitTestForLayer | John Reck | 2012-06-06 | 2 | -32/+0 | |
| | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | Merge "Revert "Fix hardcoded font path. Allow adding new font path thru Skia ... | Billy Hewlett | 2012-06-07 | 1 | -17/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Revert "Fix hardcoded font path. Allow adding new font path thru Skia changes... | Billy Hewlett | 2012-06-07 | 1 | -17/+49 |