summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at 10.0.621.0: New argument in the Cache CTORKristian Monsen2011-05-202-0/+2
| | | | | | | | | Create a default one as it will crash if set to NULL. Introduced here: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414 Change-Id: Ic22277a95f3cbdb1fa0b6ac65b01f835fb4a407e
* Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.hKristian Monsen2011-05-201-1/+1
| | | | | | | Upstream: http://codereview.chromium.org/5606002 Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
* Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonsterKristian Monsen2011-05-201-2/+2
| | | | | | | Upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414 Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
* Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need ↵Steve Block2011-05-192-5/+2
|\ | | | | | | to check supportsAlpha()"
| * ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check ↵Steve Block2011-05-192-5/+2
| | | | | | | | | | | | | | | | | | | | supportsAlpha() GIFImageDecoder::supportsAlpha() always returns true and this method will be removed in http://trac.webkit.org/changeset/77427, so updating our code now to avoid problems later. Change-Id: I2a6500608eb661ee50a7ed315e7ece49508d0f82
* | Merge "Partially revert change from 96777"Teng-Hui Zhu2011-05-181-12/+2
|\ \ | |/ |/|
| * Partially revert change from 96777Teng-Hui Zhu2011-05-181-12/+2
| | | | | | | | | | | | | | | | | | By reverting this part, the preview is scrolling fine now. The old bug 3416512 is kept fixed. This is manually integrated from MR2 change 110435 bug:4440227 Change-Id: I98d4286cb2dfa2649b172751270e1ae7c43d0887
* | Fix build when WEBARCHIVE is disabledSteve Block2011-05-183-3/+5
| | | | | | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* | Basic performance monitor for tilesJohn Reck2011-05-165-2/+200
| | | | | | | | Change-Id: Ic67a5093a7c09b870ec34160ae0c999162dddcfc
* | Merge WebKit at r75993: Fix uses of cache() functionBen Murdoch2011-05-162-7/+7
| | | | | | | | | | | | | | WebCore::cache() is renamed to WebCore::memoryCache() See http://trac.webkit.org/changeset/75857 Change-Id: Id102b534c784191461a4d077058e5c25d5741d57
* | Merge WebKit at r75993: Fix ImageSourceAndroid.cppBen Murdoch2011-05-161-8/+8
| | | | | | | | | | | | | | | | RGBA32Buffer is now named ImageFrame. See http://trac.webkit.org/changeset/75748 Change-Id: Id469057d2caa05c49f59ec489b39285dc3bf7763
* | Merge WebKit at r75993: Fix TemporaryLinkStubs.cppBen Murdoch2011-05-161-6/+0
| | | | | | | | | | | | | | PasteBoard destructor has been removed. See http://trac.webkit.org/changeset/75523 Change-Id: I9beec1cca66e84c5459b0f0f29a25902f7a9fced
* | Merge WebKit at r75993: Fix DragControllerAndroid.cppBen Murdoch2011-05-161-1/+1
| | | | | | | | | | | | | | DragData::containsURL now takes a Frame* parameter. See http://trac.webkit.org/changeset/75523 Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7
* | Merge WebKit at r75993: Fix RenderThemeAndroid.cppBen Murdoch2011-05-161-0/+1
| | | | | | | | | | | | | | PaintInfo.h include was removed from RenderObject.h in http://trac.webkit.org/changeset/75837 Change-Id: I4347c028ea55506096b658206b04e96d158c08d3
* | Merge WebKit at r75993: Fix conflicts.Ben Murdoch2011-05-168-138/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StyleElement.cpp Do not undo cherry pick of http://trac.webkit.org/changeset/80787 Conflict due to intermediate change http://trac.webkit.org/changeset/75338 SliderThumbElement.cpp Conflict due to Android TOUCH_EVENTS addition and http://trac.webkit.org/changeset/75749 DOMWindow.cpp Conflict due to clearDomStorage and http://trac.webkit.org/changeset/75739 Page.cpp Conflict due to Android APPLICATION_INSTALLED addition and http://trac.webkit.org/changeset/75604 DragData.h See http://trac.webkit.org/changeset/75523 RenderBox.cpp Conflict due to PLATFORM_ANDROID addition and http://trac.webkit.org/changeset/75837 .gitignore - keep ours RenderSVGSolidColor.cpp This file moved, so copy over our edits. Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
* | Merge WebKit at r75993: Fix MakefilesBen Murdoch2011-05-163-46/+4
| | | | | | | | Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
* | Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-16204-0/+48905
| | | | | | | | Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
* | Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-163514-28029/+792413
|/ | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* 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
generated by cgit v1.1 at 2025-06-01 09:49:09 +0000