summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-022553-236492/+302535
* Merge "Revert "Use AudioTrack::event_type not int in callback""Glenn Kasten2011-06-011-1/+1
|\
| * Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
* | Merge "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
|\ \ | |/
| * Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-011-1/+1
* | Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-018-16/+375
|/
* Merge "Add a MODULE_LICENSE file for external/webkit"Bart Sears2011-05-311-0/+0
|\
| * Add a MODULE_LICENSE file for external/webkitBart Sears2011-05-271-0/+0
* | Fix reboot loop on master ToTKristian Monsen2011-05-311-1/+1
* | Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypa...Kristian Monsen2011-05-311-4/+5
|/
* Merge "merge from honeycomb mr2"Russell Brenner2011-05-261-1/+15
|\
| * merge from honeycomb mr2Russell Brenner2011-05-261-1/+15
* | Merge "Fix more compilation error when nav_debug_ui is on."Shimeng (Simon) Wang2011-05-262-20/+20
|\ \
| * | Fix more compilation error when nav_debug_ui is on.Shimeng (Simon) Wang2011-05-262-20/+20
* | | Merge "Fix compilation error when debug_nav_ui is turned on."Shimeng (Simon) Wang2011-05-261-0/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Fix compilation error when debug_nav_ui is turned on.Shimeng (Simon) Wang2011-05-251-0/+2
* | am 06295b42: (-s ours) am 4ce956cc: am 3d487c65: Merge "DO NOT MERGE-Move che...Russell Brenner2011-05-250-0/+0
|\ \ | |/ |/|
| * am 4ce956cc: am 3d487c65: Merge "DO NOT MERGE-Move check for pending style re...Russell Brenner2011-05-251-5/+5
| |\
| | * am 3d487c65: Merge "DO NOT MERGE-Move check for pending style recalc" into ho...Russell Brenner2011-05-251-5/+5
| | |\
| | | * Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2Russell Brenner2011-05-251-5/+5
| | | |\
| | | | * DO NOT MERGE-Move check for pending style recalcRussell Brenner2011-05-241-5/+5
* | | | | Merge "Fix the way we maintain the list of Pictures in PictureSet. This impro...Nicolas Roard2011-05-253-106/+195
|\ \ \ \ \
| * | | | | Fix the way we maintain the list of Pictures in PictureSet.Nicolas Roard2011-05-243-106/+195
* | | | | | Merge "Merge chromium at 10.0.634.0: Compile fixes"Kristian Monsen2011-05-254-11/+11
|\ \ \ \ \ \
| * | | | | | Merge chromium at 10.0.634.0: Compile fixesKristian Monsen2011-05-254-11/+11
* | | | | | | Merge "merge from honeycomb mr2"Russell Brenner2011-05-251-5/+5
|\ \ \ \ \ \ \
| * | | | | | | merge from honeycomb mr2Russell Brenner2011-05-251-5/+5
* | | | | | | | Fix a typo in the LayoutTest directory listSteve Block2011-05-251-1/+1
* | | | | | | | Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6b...Steve Block2011-05-252830-42327/+187086
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge WebKit at r78450: Update ThirdPartyProject.propSteve Block2011-05-251-2/+2
| * | | | | | | Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()Steve Block2011-05-251-0/+5
| * | | | | | | Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuW...Steve Block2011-05-252-0/+6
| * | | | | | | Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature ...Steve Block2011-05-252-2/+2
| * | | | | | | Merge WebKit at r78450: HTMLAreaElement::getRect() renamedSteve Block2011-05-251-1/+1
| * | | | | | | Merge WebKit at r78450: FrameLoader::url() removedSteve Block2011-05-252-6/+5
| * | | | | | | Merge WebKit at r78450: HTMLParserQuirks removedSteve Block2011-05-251-2/+0
| * | | | | | | 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-2513-126/+136
| * | | | | | | Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-2512-101/+32
| * | | | | | | Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-259-120/+13
| * | | | | | | Merge WebKit at r78450: Fix conflicts in media controlsSteve Block2011-05-255-421/+55
| * | | | | | | Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-246-124/+17
| * | | | | | | Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-242801-41565/+187031
* | | | | | | | am 891974e8: (-s ours) am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: ...Kristian Monsen2011-05-240-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffi...Kristian Monsen2011-05-241-5/+6
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass...Kristian Monsen2011-05-241-5/+6
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
generated by cgit v1.1 at 2024-09-24 19:11:09 +0000