summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Expand)AuthorAgeFilesLines
* 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-083-8/+8
* 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
* 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-031-0/+1
|\ \
| * | Initial support for serializing the view stateJohn Reck2011-06-031-0/+1
* | | 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-031-0/+2
|\ \ \ \ \
| * | | | | Add API to allow plugins to lock their orientation in full-screen mode.Derek Sollenberger2011-06-021-0/+2
* | | | | | 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
| |/ / / /
* | | | | 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
| |_|/ |/| |
* | | Remove Android guard EMULATE_JSC_BINDINGSSteve Block2011-06-023-72/+30
* | | 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-022-5/+14
* | | 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: 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 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-026-41/+9
* | Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-026-104/+4
* | Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-026-33/+33
* | Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-0214-104/+33
* | Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021264-62875/+98655
* | Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-017-16/+371
|/
* merge from honeycomb mr2Russell Brenner2011-05-261-1/+15
* Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6b...Steve Block2011-05-251428-23549/+50645
|\
| * Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()Steve Block2011-05-251-0/+5
| * Merge WebKit at r78450: TextRun::padding() renamedSteve Block2011-05-251-1/+1
| * Merge WebKit at r78450: Use new FontMetricsSteve Block2011-05-251-14/+12
| * Merge WebKit at r78450: GraphicsContext current path removedSteve Block2011-05-252-79/+12
| * Merge WebKit at r78450: TransformationMatrix multiply methods renamed and mea...Steve Block2011-05-252-26/+18
| * Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature ...Steve Block2011-05-252-2/+3
| * Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-255-9/+9
| * Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-2511-101/+31
| * Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-257-105/+7
| * Merge WebKit at r78450: Fix conflicts in media controlsSteve Block2011-05-255-421/+55
| * Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-243-5/+3
| * Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241413-22948/+50651