summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Expand)AuthorAgeFilesLines
* Remove ANDROID_CSS_RINGJohn Reck2012-01-1817-547/+25
* 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix use of DBG_SET_LOG in WebViewCore.Mangesh Ghiware2012-01-121-1/+1
* | | | | | | Merge "Move mouse on hit detection"John Reck2012-01-121-9/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move mouse on hit detectionJohn Reck2012-01-121-9/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-121-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use audio_format_t consistentlyGlenn Kasten2012-01-051-2/+2
* | | | | | Merge "Initial NavCache removal"John Reck2012-01-114-157/+225
|\ \ \ \ \ \
| * | | | | | Initial NavCache removalJohn Reck2012-01-114-157/+225
* | | | | | | resolved conflicts for merge of 9cb81f0f to masterChris Craik2012-01-111-20/+14
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fully invalidate the pictureset when content size changesChris Craik2012-01-101-21/+14
| * | | | | | Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \ \ \
| | * | | | | | Enable History API. Do not merge.Ben Murdoch2012-01-041-0/+7
| * | | | | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1Bart Sears2012-01-043-4/+51
| |\ \ \ \ \ \ \
| | * | | | | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-033-4/+51
| | |/ / / / / /
| * | | | | | | Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into i...Chris Craik2012-01-041-0/+7
| |\ \ \ \ \ \ \
| | * | | | | | | When in singlesurfacemode, resist switching out - DO NOT MERGEChris Craik2012-01-041-0/+7
| | |/ / / / / /
| * | | | | | | Merge "When loading new content, reset zoom state - DO NOT MERGE" into ics-mr1Chris Craik2012-01-041-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | When loading new content, reset zoom state - DO NOT MERGEChris Craik2012-01-041-0/+1
| | |/ / / / / /
* | | | | | | | Merge "Native function to support restore the media player state"Teng-Hui Zhu2012-01-112-0/+20
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Native function to support restore the media player stateTeng-Hui Zhu2012-01-102-0/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix code including Chromium headers to use WebKit LOG macro, rather than fram...Steve Block2012-01-111-7/+13
* | | | | | | Simplify workaround for LOG_ASSERT conflictSteve Block2012-01-111-19/+6
* | | | | | | Avoid LOG_ASSERT conflicts between the framework and Chromium in AOSPSteve Block2012-01-111-0/+23
|/ / / / / /
* | | | | | Merge "A better fix to reduce overhead of GL texture wrap setting"Teng-Hui Zhu2012-01-101-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | A better fix to reduce overhead of GL texture wrap settingTeng-Hui Zhu2012-01-101-0/+2
* | | | | | Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"Steve Block2012-01-1022-299/+289
|\ \ \ \ \ \
| * | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-1022-299/+289