summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Stub out AXObjectCache::remove()Steve Block2011-05-131-0/+5
| | | | | | See http://trac.webkit.org/changeset/75031 Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
* Merge WebKit at r75315: Fix ImageBufferSteve Block2011-05-131-11/+9
| | | | | | See http://trac.webkit.org/changeset/74868 Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
* Merge WebKit at r75315: Fix PluginData::initPlugins()Steve Block2011-05-131-1/+1
| | | | | | See http://trac.webkit.org/changeset/75217 Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
* Merge WebKit at r75315: Fix conflictsSteve Block2011-05-137-193/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - HTMLInputElement.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS See http://trac.webkit.org/changeset/74895 - HTMLInputElement.cpp and RangeInputType.cpp Conflict due to refactoring of event handling on input elements See http://trac.webkit.org/changeset/74549 - DOMWindow.cpp Conflict due to DOMWindow::clearDOMStorage() See http://trac.webkit.org/changeset/74800 - EventHandler.cpp Conflict due to longpress and doubletap vs touch event refactoring See http://trac.webkit.org/changeset/74553 - History.cpp Trivial conflict due to cherry-pick See http://trac.webkit.org/changeset/74853 - GraphicsContext.cpp Conflict due to PLATFORM(ANDROID) guard See http://trac.webkit.org/changeset/74662 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/74971 Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
* Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-136-31/+7
| | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-12100-0/+20887
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-129202-0/+2557623
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84