summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge WebKit at r72274: Fix CodeGeneratorV8.pmRussell Brenner2010-12-029-9/+20
* Merge WebKit at r72274: Add new flag to ImageSource constructor with asssocia...Russell Brenner2010-12-021-2/+3
* Merge WebKit at r72274: Add orientation stubRussell Brenner2010-12-021-2/+5
* Merge WebKit at r72274: Fix MakefilesRussell Brenner2010-12-021-0/+1
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-028-124/+18
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021026-10723/+37203
* Merge "Fix crash when syncing autofill settings."Ben Murdoch2010-12-021-9/+11
|\
| * Fix crash when syncing autofill settings.Ben Murdoch2010-12-021-9/+11
* | am 6a2e8695: am 5d1bf1f6: Merge from open-source masterJean-Baptiste Queru2010-12-020-0/+0
|\ \
| * \ am 5d1bf1f6: Merge from open-source masterJean-Baptiste Queru2010-12-021-1/+1
| |\ \
| | * \ Merge from open-source masterJean-Baptiste Queru2010-12-021-1/+1
| | |\ \
| | | * \ Merge "Fix compilation error:"Jean-Baptiste Queru2010-12-011-1/+1
| | | |\ \
| | | | * | Fix compilation error:Rene Bolldorf2010-08-181-1/+1
* | | | | | Merge "Fix style in WebCore/platform/network/android"Steve Block2010-12-022-10/+5
|\ \ \ \ \ \
| * | | | | | Fix style in WebCore/platform/network/androidSteve Block2010-12-012-10/+5
* | | | | | | Enable SPDY, and renames initChromiumLoggingKristian Monsen2010-12-025-14/+15
| |_|_|_|_|/ |/| | | | |
* | | | | | am 1fc015f0: (-s ours) am 4741f411: Do not merge.Rob Tsuk2010-12-010-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 4741f411: Do not merge.Rob Tsuk2010-12-011-0/+1
| |\ \ \ \
| | * | | | Do not merge.Rob Tsuk2010-12-011-0/+1
* | | | | | Use one WebRequestContext per WebViewSteve Block2010-12-0120-119/+111
* | | | | | Merge "b/2864818 setting the appropriate error code for certificate error."Huahui Wu2010-12-013-0/+19
|\ \ \ \ \ \
| * | | | | | b/2864818 setting the appropriate error code for certificate error.Huahui Wu2010-12-013-0/+19
* | | | | | | Merge "Do more AutoFill steup lazily"Steve Block2010-12-012-5/+11
|\ \ \ \ \ \ \
| * | | | | | | Do more AutoFill steup lazilySteve Block2010-12-012-5/+11
* | | | | | | | Merge "Fix a bug when cleaning up private browsing"Steve Block2010-12-015-59/+76
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix a bug when cleaning up private browsingSteve Block2010-12-015-59/+76
* | | | | | | | Merge "Youtube urls can now start with /v/ or /e/"Kristian Monsen2010-12-011-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Youtube urls can now start with /v/ or /e/Kristian Monsen2010-12-011-1/+4
* | | | | | | | WtfStringToJString should be able to return a valid string on empty inputBen Murdoch2010-12-013-5/+7
* | | | | | | | Merge "Add FlushCookieStore() method to CookieManager (C++ side)."Iain Merrick2010-12-011-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Add FlushCookieStore() method to CookieManager (C++ side).Iain Merrick2010-12-011-0/+9
* | | | | | | | | Merge "attach the last extra to the next picture"Cary Clark2010-12-012-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | attach the last extra to the next pictureCary Clark2010-12-012-1/+3
| |/ / / / / / / /
* | | | | | | | | pass the x and y to retrieve anchor dataCary Clark2010-12-012-17/+25
|/ / / / / / / /
* | | | | | | | am e5097951: (-s ours) am 5793dcc1: Merge "Do not merge: fix dns prefetch, mu...Cary Clark2010-12-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | am 5793dcc1: Merge "Do not merge: fix dns prefetch, multiply range" into ging...Cary Clark2010-11-302-6/+29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Do not merge: fix dns prefetch, multiply range" into gingerbreadCary Clark2010-11-302-6/+29
| | |\ \ \ \ \
| | | * | | | | Do not merge: fix dns prefetch, multiply rangeCary Clark2010-10-292-6/+29
* | | | | | | | Merge "hit test complete node even if partially visible"Cary Clark2010-11-301-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | hit test complete node even if partially visibleCary Clark2010-11-291-3/+5
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Remove a superfluous TODO in ResourceLoaderAndroid.cppSteve Block2010-11-301-1/+0
* | | | | | | | Merge "Provide a URLRequestContext directly to AutoFill, rather than a factor...Steve Block2010-11-301-6/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Provide a URLRequestContext directly to AutoFill, rather than a factory functionSteve Block2010-11-301-6/+1
* | | | | | | | | am a5b8875c: (-s ours) am 1baa4609: Cherry-pick WebKit security fix (webkit.o...Bart Sears2010-11-290-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 1baa4609: Cherry-pick WebKit security fix (webkit.org r64706) Do not mergeBart Sears2010-11-292-0/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Cherry-pick WebKit security fix (webkit.org r64706) Do not mergeBart Sears2010-11-042-0/+7
| | | |/ / / | | |/| | |
* | | | | | Merge "Refactoring the zoom"Nicolas Roard2010-11-293-40/+52
|\ \ \ \ \ \
| * | | | | | Refactoring the zoomNicolas Roard2010-11-243-40/+52
* | | | | | | Merge "AutoFill no longer needs a unique profile id native side."Ben Murdoch2010-11-291-4/+0
|\ \ \ \ \ \ \
| * | | | | | | AutoFill no longer needs a unique profile id native side.Ben Murdoch2010-11-291-4/+0