summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cleanspec after V8 Crankshaft is configurable in makefile.Ben Murdoch2011-06-101-1/+2
* Merge WebKit at r84325: Update ThirdPartyProject.propBen Murdoch2011-06-101-2/+2
* Merge WebKit at r74325: Build fix.Ben Murdoch2011-06-102-0/+4
* Merge WebKit at r84325: Fix MediaControls.Ben Murdoch2011-06-105-585/+21
* Merge Webkit at r84325: Fix SelectText.cppBen Murdoch2011-06-101-3/+5
* Merge WebKit at r84325: Fix uses of JavaInstance.Ben Murdoch2011-06-103-7/+19
* Merge WebKit at r84325: Fix EditorClientAndroid.Ben Murdoch2011-06-102-2/+2
* Merge WebKit at r84325: Fix FrameLoaderClient.Ben Murdoch2011-06-102-5/+6
* Merge WebKit at r84325: Fix RenderLayerCompositor.cppBen Murdoch2011-06-101-5/+1
* Merge WebKit at r84325: Fix GraphicsContextAndroid.cppBen Murdoch2011-06-101-1/+1
* Merge WebKit at r84325: Fix ImageBufferData.hBen Murdoch2011-06-102-4/+8
* Merge WebKit at r84325: Fix makefiles.Ben Murdoch2011-06-108-50/+32
* Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-1021-269/+113
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-102522-40484/+102535
* Remove files from the top level directory that we don't need.Ben Murdoch2011-06-104-13404/+0
* Fix build break for emulatorKristian Monsen2011-06-091-2/+2
* Merge "Implement net::URLRequest::Delegate::OnCertificateRequested"Brian Carlstrom2011-06-098-3/+164
|\
| * Implement net::URLRequest::Delegate::OnCertificateRequestedBrian Carlstrom2011-06-098-3/+164
* | Fix a bug in the V8 JNI bindings when creating JNI method signaturesSteve Block2011-06-091-0/+12
|/
* Merge "Serialize LayerAndroid"John Reck2011-06-086-13/+368
|\
| * Serialize LayerAndroidJohn Reck2011-06-076-13/+368
* | Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72...Steve Block2011-06-082860-30090/+112049
|\ \
| * | Merge WebKit at r82507: Update ThirdPartyProject.propSteve Block2011-06-081-2/+2
| * | Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ...Steve Block2011-06-082-0/+5
| * | Merge WebKit at r82507: Work around a V8 bugSteve Block2011-06-081-0/+10
| * | Merge WebKit at r82507: JNIType renamed to JavaTypeSteve Block2011-06-081-1/+1
| * | Merge WebKit at r82507: IconDatabaseClient interface expandedSteve Block2011-06-082-4/+38
| * | Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElemen...Steve Block2011-06-081-1/+2
| * | Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamedSteve Block2011-06-084-9/+15
| * | Merge WebKit at r82507: IconDatabaseBase::Open() signature changedSteve Block2011-06-081-1/+1
| * | Merge WebKit at r82507: Node::isContentEditable() renamedSteve Block2011-06-081-1/+1
| * | Merge WebKit at r82507: Use icon database through IconDatabaseBaseSteve Block2011-06-081-1/+1
| * | Merge WebKit at r82507: toInputElement() is now a member of NodeSteve Block2011-06-082-2/+2
| * | Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changedSteve Block2011-06-082-4/+3
| * | Merge WebKit at r82507: StringImpl::computeHash() removedSteve Block2011-06-081-2/+1
| * | Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()Steve Block2011-06-081-0/+1
| * | Merge WebKit at r82507: Path::strokeBoundingRect() is now constSteve Block2011-06-081-1/+1
| * | Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCache...Steve Block2011-06-081-0/+1
| * | Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.hSteve Block2011-06-081-0/+2
| * | Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatf...Steve Block2011-06-082-3/+3
| * | Merge WebKit at r82507: Fix conflicts due to JNI refactoringSteve Block2011-06-082-57/+30
| * | Merge WebKit at r82507: Fix conflicts due to new StorageTrackerSteve Block2011-06-085-95/+52
| * | Merge WebKit at r82507: Fix conflictsSteve Block2011-06-0817-165/+86
| * | Merge WebKit at r82507: Fix makefilesSteve Block2011-06-086-29/+10
| * | Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-082843-29948/+112017
* | | Merge "Remove a FIXME from JavaNPObjectV8 that was forking us from upstream"Steve Block2011-06-081-3/+0
|\ \ \ | |/ /
| * | Remove a FIXME from JavaNPObjectV8 that was forking us from upstreamSteve Block2011-06-081-3/+0
* | | Merge "Fix a whitespace diff with upstream to avoid a future merge conflict"Steve Block2011-06-081-1/+0
|\ \ \ | |/ /
| * | Fix a whitespace diff with upstream to avoid a future merge conflictSteve Block2011-06-081-1/+0
* | | Merge "Fix some include guards in Android files"Steve Block2011-06-0856-127/+129
|\ \ \ | |/ /