summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271055-8109/+110820
* Merge "Remove the unnecessary return keyword."Shimeng (Simon) Wang2010-05-263-6/+6
|\
| * Remove the unnecessary return keyword.Shimeng (Simon) Wang2010-05-263-6/+6
* | Merge "Refix http://b/issue?id=2509597."Grace Kloba2010-05-262-20/+13
|\ \ | |/ |/|
| * Refix http://b/issue?id=2509597.Grace Kloba2010-05-262-20/+13
* | Choose right operator new/delete in case of multiple inheritance.Shimeng (Simon) Wang2010-05-261-0/+16
|/
* Merge WebKit at r59636: Update WebKit versionKristian Monsen2010-05-251-2/+2
* Merge "Merge WebKit at r59636: Variable changed to method upstream http://tra...Kristian Monsen2010-05-251-1/+1
|\
| * Merge WebKit at r59636: Variable changed to method upstreamKristian Monsen2010-05-251-1/+1
* | Merge "Merge WebKit at r59636: Added header needed for Android"Kristian Monsen2010-05-251-0/+2
|\ \ | |/
| * Merge WebKit at r59636: Added header needed for AndroidKristian Monsen2010-05-251-0/+2
* | Merge "Merge WebKit at r59636: Method name changed upstream http://trac.webki...Kristian Monsen2010-05-251-1/+1
|\ \ | |/
| * Merge WebKit at r59636: Method name changed upstreamKristian Monsen2010-05-251-1/+1
* | Merge changes I03b28d93,Ie53e458fKristian Monsen2010-05-257-22/+45
|\ \ | |/
| * Merge WebKit at r59636: Fix Android ifdef, commas moved upstream.Kristian Monsen2010-05-251-2/+2
| * Merge WebKit at r59636: Fix makefilesKristian Monsen2010-05-256-20/+43
* | Merge "Merge WebKit at r59636: Fix conflicts"Kristian Monsen2010-05-254-128/+26
|\ \ | |/
| * Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-254-128/+26
* | Merge "Merge WebKit at r59636: Initial merge by git"Kristian Monsen2010-05-251048-37318/+70667
|\ \ | |/
| * Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251048-37318/+70667
* | Do not try to show pdf's in the browser.Patrick Scott2010-05-251-19/+25
|/
* Merge "First draft to add a fat point to WebKit hit test."Grace Kloba2010-05-2417-0/+331
|\
| * First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-2417-0/+331
* | Only set extra_layout_delay if the loader is notGrace Kloba2010-05-241-1/+3
* | Merge "Fix a binding big in WebKit which prevents url hijacking for mobile ad...Grace Kloba2010-05-242-2/+2
|\ \
| * | Fix a binding big in WebKit which prevents urlGrace Kloba2010-05-242-2/+2
* | | implement Canvas.toDataURLCary Clark2010-05-241-7/+21
* | | Merge "check for null on extremely large images"Cary Clark2010-05-241-1/+1
|\ \ \
| * | | check for null on extremely large imagesCary Clark2010-05-241-1/+1
| |/ /
* | | Merge "Cherry-pick WebKit change 59918 to fix Java bridge for JSC"Steve Block2010-05-241-1/+3
|\ \ \
| * | | Cherry-pick WebKit change 59918 to fix Java bridge for JSCSteve Block2010-05-211-1/+3
* | | | Merge "Update Android to reflect upstreamed code to avoid Geolocation leaks"Steve Block2010-05-244-52/+21
|\ \ \ \
| * | | | Update Android to reflect upstreamed code to avoid Geolocation leaksSteve Block2010-05-244-52/+21
| |/ / /
* | | | Remove the use of a timer to delay painting, instead use a flag and check itNicolas Roard2010-05-213-8/+16
* | | | Merge "reverse RTL characters in copy"Cary Clark2010-05-212-0/+110
|\ \ \ \
| * | | | reverse RTL characters in copyCary Clark2010-05-212-0/+110
| | |/ / | |/| |
* | | | Provide a string for the case where a file upload control has not had a file ...Ben Murdoch2010-05-214-6/+16
* | | | Update file chooser to pass the accept type from WebCore to Java.Ben Murdoch2010-05-211-4/+13
* | | | Add a method to the PlatformBridge to resolve the filename of a fileBen Murdoch2010-05-2110-23/+101
* | | | Fix incorrect position when using CSS shadows, and use left/top over right/bo...Nicolas Roard2010-05-203-56/+42
|/ / /
* | | Fix the infinite loop when flatten iframes.Patrick Scott2010-05-201-9/+3
* | | Merge "Update Android to reflect upstreaming of PluginView JSC guards in WebK...Steve Block2010-05-202-36/+12
|\ \ \
| * | | Update Android to reflect upstreaming of PluginView JSC guards in WebKit chan...Steve Block2010-05-202-36/+12
| |/ /
* | | Fix build.Leon Scroggins III2010-05-191-0/+1
* | | Prohibit scrolling not initiated by the user.Leon Scroggins III2010-05-193-1/+17
| |/ |/|
* | am 5a1f66aa: am ec92ec7c: merge from open-source masterThe Android Open Source Project2010-05-180-0/+0
|\ \ | |/ |/|
| * am ec92ec7c: merge from open-source masterThe Android Open Source Project2010-05-180-0/+0
| |\
| | * merge from open-source masterThe Android Open Source Project2010-05-180-0/+0
| | |\
| | | * Merge "Check for the absence of a frame. This crashes in the situation where ...Jean-Baptiste Queru2010-05-181-1/+2
| | | |\
| | | | * Check for the absence of a frame.Leon Clarke2010-05-131-1/+2