summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Reduce the number of the composited layers."Chris Craik2012-01-251-1/+13
|\
| * Reduce the number of the composited layers.Chris Craik2012-01-121-1/+13
* | Merge "Fix auto-complete for content-editable fields."George Mount2012-01-252-102/+160
|\ \
| * | Fix auto-complete for content-editable fields.George Mount2012-01-242-102/+160
* | | Fix form button layoutMichael Kolb2012-01-249-204/+60
* | | Merge changes Ie4655349,I8696c362,Ie18ec51fRussell Brenner2012-01-241-15/+33
|\ \ \
| * | | Fix uninitialized return value for decodingRussell Brenner2012-01-241-4/+2
| * | | Refine WebHistory log outputRussell Brenner2012-01-241-10/+31
| * | | Revert "Enable verbose debugging for WebHistory"Russell Brenner2012-01-231-1/+0
* | | | Add tree swapping properties and statsChris Craik2012-01-244-8/+41
| |/ / |/| |
* | | Merge "Delay the shader init till the draw time."Teng-Hui Zhu2012-01-231-3/+11
|\ \ \
| * | | Delay the shader init till the draw time.Teng-Hui Zhu2012-01-231-3/+11
* | | | Merge "Removed navcache from scrollToFrame() and nativeFindAll()."Victoria Lease2012-01-231-13/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Removed navcache from scrollToFrame() and nativeFindAll().Victoria Lease2012-01-201-13/+11
* | | | Merge "Add cut and paste to ContentEditable."George Mount2012-01-233-0/+200
|\ \ \ \
| * | | | Add cut and paste to ContentEditable.George Mount2012-01-183-0/+200
* | | | | am 9d7bc9ea: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Remove ANDROID_CSS_RING"John Reck2012-01-1917-547/+25
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove ANDROID_CSS_RINGJohn Reck2012-01-1817-547/+25
* | | | | | | Merge "Support aspect ratio for the inline video"Teng-Hui Zhu2012-01-185-19/+69
|\ \ \ \ \ \ \
| * | | | | | | Support aspect ratio for the inline videoTeng-Hui Zhu2012-01-185-19/+69
* | | | | | | | Merge "Fix software extras on base layer"John Reck2012-01-184-12/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix software extras on base layerJohn Reck2012-01-184-12/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Add tapHighlightColor supportJohn Reck2012-01-182-3/+14
|/ / / / / / /
* | | | | | | Merge "Support javascript to exit full screen video"Teng-Hui Zhu2012-01-173-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Support javascript to exit full screen videoTeng-Hui Zhu2012-01-163-0/+24
* | | | | | Merge changes Id68b9b29,I2f1a6b3d,I8cde579dRussell Brenner2012-01-171-150/+207
|\ \ \ \ \ \
| * | | | | | Enable verbose debugging for WebHistoryRussell Brenner2012-01-171-0/+1
| * | | | | | Refactor WebHistoryRussell Brenner2012-01-171-148/+200
| * | | | | | Update unitTest to match current WebHistoryRussell Brenner2012-01-171-2/+6
* | | | | | | Merge "Basic code cleanup"Russell Brenner2012-01-171-114/+114
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Basic code cleanupRussell Brenner2012-01-171-114/+114
* | | | | | | Merge "Only draw cursor rings once."Victoria Lease2012-01-173-2/+29
|\ \ \ \ \ \ \
| * | | | | | | Only draw cursor rings once.Victoria Lease2012-01-133-2/+29
* | | | | | | | Merge "Honor 50 millisecond cap for WebKit JavaScript execution."George Mount2012-01-171-23/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Honor 50 millisecond cap for WebKit JavaScript execution.George Mount2012-01-131-23/+24
* | | | | | | | | Merge "Refactor hit test object"John Reck2012-01-175-203/+361
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor hit test objectJohn Reck2012-01-135-203/+361
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Implement the TODO items for VerticalTextMap.cpp"claireho2012-01-131-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement the TODO items for VerticalTextMap.cppclaireho2012-01-131-5/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "fix jumpy scrolling on layers"Michael Kolb2012-01-131-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix jumpy scrolling on layersMichael Kolb2012-01-131-2/+4
* | | | | | | | | | am 03eb7752: am 3c049d2a: Prevent infinite loop when turning on then off comp...Nicolas Roard2012-01-131-0/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am 3c049d2a: Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-131-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-121-0/+14
* | | | | | | | | | Merge "Fix GPL build"Glenn Kasten2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix GPL buildGlenn Kasten2012-01-121-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix use of DBG_SET_LOG in WebViewCore."Mangesh Ghiware2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |