Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Support aspect ratio for the inline video" | Teng-Hui Zhu | 2012-01-18 | 5 | -19/+69 |
|\ | |||||
| * | Support aspect ratio for the inline video | Teng-Hui Zhu | 2012-01-18 | 5 | -19/+69 |
* | | Merge "Fix software extras on base layer" | John Reck | 2012-01-18 | 4 | -12/+10 |
|\ \ | |||||
| * | | Fix software extras on base layer | John Reck | 2012-01-18 | 4 | -12/+10 |
* | | | Add tapHighlightColor support | John Reck | 2012-01-18 | 2 | -3/+14 |
|/ / | |||||
* | | Merge "Support javascript to exit full screen video" | Teng-Hui Zhu | 2012-01-17 | 3 | -0/+24 |
|\ \ | |/ | |||||
| * | Support javascript to exit full screen video | Teng-Hui Zhu | 2012-01-16 | 3 | -0/+24 |
* | | Merge changes Id68b9b29,I2f1a6b3d,I8cde579d | Russell Brenner | 2012-01-17 | 1 | -150/+207 |
|\ \ | |||||
| * | | Enable verbose debugging for WebHistory | Russell Brenner | 2012-01-17 | 1 | -0/+1 |
| * | | Refactor WebHistory | Russell Brenner | 2012-01-17 | 1 | -148/+200 |
| * | | Update unitTest to match current WebHistory | Russell Brenner | 2012-01-17 | 1 | -2/+6 |
* | | | Merge "Basic code cleanup" | Russell Brenner | 2012-01-17 | 1 | -114/+114 |
|\ \ \ | |/ / | |||||
| * | | Basic code cleanup | Russell Brenner | 2012-01-17 | 1 | -114/+114 |
* | | | Merge "Only draw cursor rings once." | Victoria Lease | 2012-01-17 | 3 | -2/+29 |
|\ \ \ | |||||
| * | | | Only draw cursor rings once. | Victoria Lease | 2012-01-13 | 3 | -2/+29 |
* | | | | Merge "Honor 50 millisecond cap for WebKit JavaScript execution." | George Mount | 2012-01-17 | 1 | -23/+24 |
|\ \ \ \ | |||||
| * | | | | Honor 50 millisecond cap for WebKit JavaScript execution. | George Mount | 2012-01-13 | 1 | -23/+24 |
* | | | | | Merge "Refactor hit test object" | John Reck | 2012-01-17 | 5 | -203/+361 |
|\ \ \ \ \ | |||||
| * | | | | | Refactor hit test object | John Reck | 2012-01-13 | 5 | -203/+361 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge "Implement the TODO items for VerticalTextMap.cpp" | claireho | 2012-01-13 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Implement the TODO items for VerticalTextMap.cpp | claireho | 2012-01-13 | 1 | -5/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge "fix jumpy scrolling on layers" | Michael Kolb | 2012-01-13 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | fix jumpy scrolling on layers | Michael Kolb | 2012-01-13 | 1 | -2/+4 |
* | | | | | | am 03eb7752: am 3c049d2a: Prevent infinite loop when turning on then off comp... | Nicolas Roard | 2012-01-13 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | am 3c049d2a: Prevent infinite loop when turning on then off composited mode | Nicolas Roard | 2012-01-13 | 1 | -0/+14 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Prevent infinite loop when turning on then off composited mode | Nicolas Roard | 2012-01-12 | 1 | -0/+14 |
* | | | | | | | | Merge "Fix GPL build" | Glenn Kasten | 2012-01-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix GPL build | Glenn Kasten | 2012-01-12 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Fix use of DBG_SET_LOG in WebViewCore." | Mangesh Ghiware | 2012-01-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix use of DBG_SET_LOG in WebViewCore. | Mangesh Ghiware | 2012-01-12 | 1 | -1/+1 |
* | | | | | | | | Merge "Move mouse on hit detection" | John Reck | 2012-01-12 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Move mouse on hit detection | John Reck | 2012-01-12 | 1 | -9/+10 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge "Use audio_format_t consistently" | Glenn Kasten | 2012-01-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Use audio_format_t consistently | Glenn Kasten | 2012-01-05 | 1 | -2/+2 |
* | | | | | | | am dc9c9187: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-11 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge "Initial NavCache removal" | John Reck | 2012-01-11 | 4 | -157/+225 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Initial NavCache removal | John Reck | 2012-01-11 | 4 | -157/+225 |
* | | | | | | | | | resolved conflicts for merge of 9cb81f0f to master | Chris Craik | 2012-01-11 | 1 | -20/+14 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am b627d5bd: Fully invalidate the pictureset when content size changes | Chris Craik | 2012-01-11 | 1 | -21/+14 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fully invalidate the pictureset when content size changes | Chris Craik | 2012-01-10 | 1 | -21/+14 |
* | | | | | | | | | Merge "Native function to support restore the media player state" | Teng-Hui Zhu | 2012-01-11 | 2 | -0/+20 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Native function to support restore the media player state | Teng-Hui Zhu | 2012-01-10 | 2 | -0/+20 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Fix code including Chromium headers to use WebKit LOG macro, rather than fram... | Steve Block | 2012-01-11 | 1 | -7/+13 |
* | | | | | | | | Simplify workaround for LOG_ASSERT conflict | Steve Block | 2012-01-11 | 1 | -19/+6 |
* | | | | | | | | Disable C++0x compatibility warnings | Steve Block | 2012-01-11 | 1 | -0/+1 |
* | | | | | | | | Avoid LOG_ASSERT conflicts between the framework and Chromium in AOSP | Steve Block | 2012-01-11 | 1 | -0/+23 |
|/ / / / / / / | |||||
* | | | | | | | Merge "A better fix to reduce overhead of GL texture wrap setting" | Teng-Hui Zhu | 2012-01-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | A better fix to reduce overhead of GL texture wrap setting | Teng-Hui Zhu | 2012-01-10 | 1 | -0/+2 |