summaryrefslogtreecommitdiffstats
path: root/Tools
Commit message (Collapse)AuthorAgeFilesLines
* host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-151-2/+0
| | | | Change-Id: I52f9c80418f9960e463664096f98bcbcf79ecc6b
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-10293-2512/+9150
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-08309-911/+8423
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-02223-33045/+39085
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge changes ↵Steve Block2011-05-25236-2066/+10827
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f * changes: Merge WebKit at r78450: Update ThirdPartyProject.prop Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText() Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed Merge WebKit at r78450: HTMLAreaElement::getRect() renamed Merge WebKit at r78450: FrameLoader::url() removed Merge WebKit at r78450: HTMLParserQuirks removed Merge WebKit at r78450: TextRun::padding() renamed Merge WebKit at r78450: Use new FontMetrics Merge WebKit at r78450: GraphicsContext current path removed Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed Merge WebKit at r78450: IntRect::bottom()/right() renamed Merge WebKit at r78450: Fix remaining conflicts Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard Merge WebKit at r78450: Fix conflicts in media controls Merge WebKit at r78450: Fix Makefiles Merge WebKit at r78450: Initial merge by git.
| * Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-24236-2066/+10827
| | | | | | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* | In DRT2, correctly handle a non-existent pathSteve Block2011-05-241-6/+8
|/ | | | | | | | Currently, if the path is not found, the script proceeds as if the root had been specified. Bug: 3291382 Change-Id: I1aea78eb66392c2f883148a895ec5ecca20d3ad9
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2389-945/+2136
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-16103-418/+2306
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12188-2927/+4427
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101360-0/+352056
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb