summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Show layer tree in hierarchyviewerJohn Reck2012-06-1411-122/+239
* Merge "Revert "Revert "Add layer clip check to hide handles when not visible."""George Mount2012-06-121-0/+23
|\
| * Revert "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-0/+23
* | am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \
| * \ am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| |\ \
| | * \ Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| | |\ \
| | | * | Call the right updatePositions*John Reck2012-06-112-8/+8
* | | | | am d09512ae: am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| | |\ \ \
| | | * | | Workaround double blit failureChris Craik2012-06-123-0/+12
* | | | | | am 45476c6e: am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| | |/ / /
* | | | | Merge "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-23/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Revert "Add layer clip check to hide handles when not visible."George Mount2012-06-121-23/+0
* | | | | Merge "Add layer clip check to hide handles when not visible."George Mount2012-06-121-0/+23
|\ \ \ \ \ | |/ / / /
| * | | | Add layer clip check to hide handles when not visible.George Mount2012-06-071-0/+23
* | | | | Merge "Fix edit text capturing selection."George Mount2012-06-122-23/+24
|\ \ \ \ \
| * | | | | Fix edit text capturing selection.George Mount2012-06-062-23/+24
* | | | | | am dc9e0296: (-s ours) am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "D...Geremy Condra2012-06-110-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am e0766f08: (-s ours) am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit ...Geremy Condra2012-06-110-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am 31874a9d: (-s ours) Merge "DO NOT MERGE Add webkit plumbing for file origi...Geremy Condra2012-06-110-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "DO NOT MERGE Add webkit plumbing for file origin policy"Geremy Condra2012-06-111-0/+14
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE Add webkit plumbing for file origin policySelim Gurun2012-06-061-0/+14
| | | |/ / / / /
* | | | | | | | am f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros...Selim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Remove forgotten CHROME_NETWORK_STACK macrosSelim Gurun2012-06-081-2/+0
* | | | | | | | am 42fe1d5b: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ am a2cd3028: am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when scro...John Reck2012-06-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when scrolling a rende...John Reck2012-06-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Disable dispatchFakeMouseMoveEvent when scrolling a render layer" into...John Reck2012-06-111-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Disable dispatchFakeMouseMoveEvent when scrolling a render layerJohn Reck2012-06-081-0/+2
| | | |/ / / / / / /
* | | | | | | | | | Merge "Support separation interface and implementations of WebView classes"Jonathan Dixon2012-06-081-33/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support separation interface and implementations of WebView classesJesse Greenwald2012-06-011-33/+32
* | | | | | | | | | | am fa20fc4f: am 6cb37392: Merge "Make sure we gather the textures before any ...Teng-Hui Zhu2012-06-081-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 6cb37392: Merge "Make sure we gather the textures before any prepare work"...Teng-Hui Zhu2012-06-081-3/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Make sure we gather the textures before any prepare work" into jb-devTeng-Hui Zhu2012-06-081-3/+4
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Make sure we gather the textures before any prepare workTeng-Hui Zhu2012-06-071-3/+4
* | | | | | | | | | | am 334b4068: am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed in...John Reck2012-06-071-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed in ptr" into jb...John Reck2012-06-071-6/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Switch stopGL and destroy to use a passed in ptr" into jb-devJohn Reck2012-06-071-6/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Switch stopGL and destroy to use a passed in ptrJohn Reck2012-06-071-6/+7
* | | | | | | | | | | | am dda8bbad: am b44cdc90: Merge "Add fast drawing path for repeat background ...Teng-Hui Zhu2012-06-079-49/+253
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am b44cdc90: Merge "Add fast drawing path for repeat background image." into ...Teng-Hui Zhu2012-06-079-49/+253
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Add fast drawing path for repeat background image." into jb-devTeng-Hui Zhu2012-06-079-49/+253
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |