summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-082843-29948/+112017
* Remove a FIXME from JavaNPObjectV8 that was forking us from upstreamSteve Block2011-06-081-3/+0
* Fix a whitespace diff with upstream to avoid a future merge conflictSteve Block2011-06-081-1/+0
* Fix some include guards in Android filesSteve Block2011-06-0856-127/+129
* Remove all contents of Source/ThirdParty other than ANGLESteve Block2011-06-083-189/+0
* Update PlatformTouchEvent for Android to reflect upstreamed versionSteve Block2011-06-072-3/+0
* Move all Android modification to Settings to the end of the relevant blockSteve Block2011-06-072-41/+42
* Fix issues with setting viewstate before initializingJohn Reck2011-06-042-6/+11
* Merge "Fix the trailing pixels by inflate the invalidate screen rect"Teng-Hui Zhu2011-06-031-0/+2
|\
| * Fix the trailing pixels by inflate the invalidate screen rectTeng-Hui Zhu2011-06-031-0/+2
* | Merge "Initial support for serializing the view state"John Reck2011-06-037-0/+129
|\ \
| * | Initial support for serializing the view stateJohn Reck2011-06-037-0/+129
* | | Merge "Revert "Fix for antialiased text with shadows.""Derek Sollenberger2011-06-031-1/+0
|\ \ \
| * | | Revert "Fix for antialiased text with shadows."Derek Sollenberger2011-06-031-1/+0
* | | | Merge "Add image/webp to the mimeType list."Shimeng (Simon) Wang2011-06-031-0/+1
|\ \ \ \
| * | | | Add image/webp to the mimeType list.Shimeng (Simon) Wang2011-06-021-0/+1
* | | | | Merge "Add API to allow plugins to lock their orientation in full-screen mode."Derek Sollenberger2011-06-037-6/+91
|\ \ \ \ \
| * | | | | Add API to allow plugins to lock their orientation in full-screen mode.Derek Sollenberger2011-06-027-6/+91
* | | | | | Merge "Fix for antialiased text with shadows."Derek Sollenberger2011-06-031-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix for antialiased text with shadows.Derek Sollenberger2011-06-031-0/+1
| |/ / / /
* | | | | am 3ae2cf5e: (-s ours) Merge from honeycomb-LTE - do not mergeJean-Baptiste Queru2011-06-020-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge from honeycomb-LTE - do not mergeJean-Baptiste Queru2011-05-261-1/+15
| |\ \ \ \ \
| | * \ \ \ \ am 0da3e5e1: Update isFallbackFamily() with missing fontsRussell Brenner2011-05-261-1/+15
| | |\ \ \ \ \
| | | * | | | | Update isFallbackFamily() with missing fontsRussell Brenner2011-05-261-1/+15
* | | | | | | | Update RenderLayer.cpp with upstreamed version of crash fixSteve Block2011-06-021-9/+3
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Fix a whitespace diff in SubresourceLoader.cppSteve Block2011-06-021-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Remove Android guard EMULATE_JSC_BINDINGS"Steve Block2011-06-023-72/+30
|\ \ \ \ \ \
| * | | | | | Remove Android guard EMULATE_JSC_BINDINGSSteve Block2011-06-023-72/+30
* | | | | | | Merge "Fix master-gpl build."Ben Murdoch2011-06-021-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix master-gpl build.Ben Murdoch2011-06-021-1/+4
* | | | | | | Merge "Fix compiler warning in CachedResourceLoader"Steve Block2011-06-021-2/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix compiler warning in CachedResourceLoaderSteve Block2011-06-021-2/+1
| |/ / / / /
* | | | | | Always check weak global references before using themSteve Block2011-06-0211-238/+567
* | | | | | Merge "JavaScriptCore/config.h should not include WebCore/config.h"Steve Block2011-06-021-6/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | JavaScriptCore/config.h should not include WebCore/config.hSteve Block2011-06-021-6/+3
* | | | | | Merge WebKit at r80534: Update ThirdPartyProject.propBen Murdoch2011-06-021-2/+2
* | | | | | Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cppBen Murdoch2011-06-022-48/+18
* | | | | | Merge WebKit at r80534: Fix JSNavigatorCustom.cppBen Murdoch2011-06-021-1/+1
* | | | | | Merge WebKit at r80534: Fix GraphicsContextAndroid.cppBen Murdoch2011-06-021-0/+8
* | | | | | Merge WebKit at r80534: Fix EditorClientAndroidBen Murdoch2011-06-022-1/+8
* | | | | | Merge WebKit to r80534: Fix ChromeClientAndroidBen Murdoch2011-06-022-2/+5
* | | | | | Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cppBen Murdoch2011-06-021-1/+1
* | | | | | Merge WebKit at r80534: Fix FrameLoaderClientAndroid.Ben Murdoch2011-06-022-5/+10
* | | | | | Merge WebKit at r80534: Fix IconDatabase uses.Ben Murdoch2011-06-024-14/+14
* | | | | | Merge WebKit at r80534: Fix JavaMethod.cppBen Murdoch2011-06-021-0/+4
* | | | | | Merge WebKit at r80534: Fix Java Bridge.Ben Murdoch2011-06-023-20/+9
* | | | | | Merge WebKit at r80534: Fix ImageSourceAndroid.cppBen Murdoch2011-06-021-3/+7
* | | | | | Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-027-42/+10
* | | | | | Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-026-104/+4
* | | | | | Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-029-35/+46