summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r96122 to fix a LayoutTest crashSteve Block2012-04-121-0/+5
| | | | | | | | | fast/canvas/crash-set-font.html See http://trac.webkit.org/changeset/96122 Bug: 6328797 Change-Id: I9d9fdbffb19e61615d352c20e24946cf01306903
* Cherry-pick WebKit change r94841 to fix a LayoutTest crashSteve Block2012-04-121-1/+1
| | | | | | | | | editing/execCommand/ident-crashes-topnode-is-text.html See http://trac.webkit.org/changeset/94841 Bug: 6329306 Change-Id: Ic27f31beae3b390a4aba1797c13c8d36422911f5
* Cherry-pick WebKit change r94511 to fix a LayoutTest crashSteve Block2012-04-121-5/+10
| | | | | | | | | fast/dom/Range/range-delete-contents-event-fire-crash.html See http://trac.webkit.org/changeset/94511 Bug: 6329028 Change-Id: I00cc0e6520831f20f6177f18f4e86d471003ea58
* Cherry-pick WebKit change r94215 to fix a LayoutTest crashSteve Block2012-04-121-0/+2
| | | | | | | | | fast/gradients/css3-radial-gradient-crash.html See http://trac.webkit.org/changeset/94215 Bug: 6328935 Change-Id: I4414885e54a60aa05346c002c40835334685b1cb
* Cherry-pick WebKit change r92139 to fix a LayoutTest crashSteve Block2012-04-122-10/+14
| | | | | | | | | | | | editing/input/search-field-crash-in-designmode.html Manually resolved a merge conflict in CSSStyleSelector::isAtShadowBoundary() due to http://trac.webkit.org/changeset/88476. See http://trac.webkit.org/changeset/92139 Bug: 6329073 Change-Id: If869bd58a689bb918ef47048c4f5d2e84e4b6f89
* Cherry-pick WebKit change r87227 as a prerequisite for r92139Steve Block2012-04-123-10/+9
| | | | | | | See http://trac.webkit.org/changeset/87227 Bug: 6329073 Change-Id: I18c371c96547d5a2011847647c8fc398b0adb18d
* Cherry-pick WebKit change r85267 as a prerequisite for r92139Steve Block2012-04-125-9/+9
| | | | | | | See http://trac.webkit.org/changeset/85267 Bug: 6329073 Change-Id: I7c46eab459647059890732214a9b953adef0a647
* Cherry-pick WebKit change r90568 to fix LayoutTest crashesSteve Block2012-04-121-2/+2
| | | | | | | | | | | | | fast/flexbox/crash-button-input-autofocus.html fast/flexbox/crash-button-keygen.html fast/flexbox/crash-button-relayout.html Patch manually applied due to file rename. See http://trac.webkit.org/changeset/90568 Bug: 6328974 Change-Id: I0cee4daaea2e6fa2b9fae7d7dd81b4541561e969
* Cherry-pick WebKit change r86098 as a prerequisite for r90568Steve Block2012-04-121-249/+182
| | | | | | | See http://trac.webkit.org/changeset/86098 Bug: 6328974 Change-Id: If526b33142144f1ed466325898f9177adf27e6ee
* Cherry-pick WebKit change r89762 to fix a LayoutTest crashSteve Block2012-04-122-6/+15
| | | | | | | | | fast/dom/shadow/frameless-media-element-crash.html See http://trac.webkit.org/changeset/89762 Bug: 6329068 Change-Id: I73db520557e2ab4c04a4a2198276439e6c7932ec
* Cherry-pick WebKit change r88474 to fix a LayoutTest crashSteve Block2012-04-121-1/+2
| | | | | | | | | fast/css/webkit-keyframes-crash.html See http://trac.webkit.org/changeset/88474 Bug: 6328781 Change-Id: I9ae7d323b48ff6e55c720595fd27249176e87b8f
* Minor clean-up in DeviceOrientation and DeviceMotionSteve Block2012-04-122-5/+5
| | | | | | | | | No functional change. See corresponding frameworks/base change https://android-git.corp.google.com/g/#change,125699 Change-Id: Iad7260fd506c13e773ee7a6c2225cbc71e8acdab
* Merge "Cherry-pick WebKit change r96779 to fix window.location"Steve Block2012-04-1210-34/+16
|\
| * Cherry-pick WebKit change r96779 to fix window.locationSteve Block2012-03-2810-34/+16
| | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/96779 Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the change is not required. Bug: 2159848 Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
* | Merge "Cherry-pick WebKit change r94132 to fix default port in URLs"Steve Block2012-04-123-13/+12
|\ \ | |/
| * Cherry-pick WebKit change r94132 to fix default port in URLsSteve Block2012-03-283-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that a manual edit to HTMLAnchorElement::port() was required to avoid the use of emptyString(). See http://trac.webkit.org/changeset/94132 Bug: 2159848 Change-Id: I13ef58e18df46c1d4592c102d4eb80f54ae53020
* | Merge "Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()"Steve Block2012-04-1217-35/+40
|\ \ | |/
| * Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-2817-35/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix window.location. Note that a conflict occurred in Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the change is not required. See http://trac.webkit.org/changeset/87623 Bug: 2159848 Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
* | Merge "Cherry-pick WebKit change r84762 to fix URL canonicalization"Steve Block2012-04-121-5/+26
|\ \ | |/
| * Cherry-pick WebKit change r84762 to fix URL canonicalizationSteve Block2012-03-281-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that the 'http:example.com/' test case in fast/url/standard-url.html fails with DRT2 because of an assumption in the test that it is served as a file scheme URL. See http://trac.webkit.org/changeset/84762 Bug: 2159848 Change-Id: Ie680debcad3d285efd40134932b72d429c0d2222
* | Merge "Cherry-pick WebKit change r91386 to fix a rendering crash"Steve Block2012-04-122-1/+3
|\ \
| * | Cherry-pick WebKit change r91386 to fix a rendering crashSteve Block2012-04-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the use of RenderObject::isDeprecatedFlexibleBox() in the patch had to be changed to RenderObject::isFlexibleBox(). This method was renamed in http://trac.webkit.org/changeset/90773, which is not in Android's version of WebKit. The LayoutTest added in r91386 no longer crashes. See http://trac.webkit.org/changeset/91386 Bug: 5492762 Change-Id: Id43e55e89b4f107285b33c1a2c37a634cf10aad7
* | | Merge "Cherry-pick WebKit change r90068 to fix a rendering crash"Steve Block2012-04-124-1/+15
|\ \ \
| * | | Cherry-pick WebKit change r90068 to fix a rendering crashSteve Block2012-04-104-1/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this change does not apply cleanly in RenderBlock::destroy() without r85869. r85869 was intended to be an optimization only, with no functional change. However, it introduced two crashes, one of which is fixed in r90068 and the other in r86060. To avoid the need to cherry-pick both r85869 and r86060 as prerequisites, the patch for r90068 was applied manually to give the correct end result in RenderBlock::destroy(). We now pass the LayoutTests added in r90068 and the LayoutTest added in r86060 does not crash. See http://trac.webkit.org/changeset/90068 Bug: 5496903 Change-Id: Ica6dc2c70a4cd5c781ae77df95a8a4033c097708
* | | Merge "Free local references as early as possible."George Mount2012-04-112-12/+19
|\ \ \
| * | | Free local references as early as possible.George Mount2012-04-112-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6300264 Change-Id: I29ffffa9be33884a3e6a1c9fc5bb5cac95585cdc
* | | | Merge "New touch input support"John Reck2012-04-114-13/+30
|\ \ \ \
| * | | | New touch input supportJohn Reck2012-04-114-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: Idea47af14e282b42c902c8158f08f6742ba576da
* | | | | Merge "Fix crash."Mangesh Ghiware2012-04-111-21/+22
|\ \ \ \ \
| * | | | | Fix crash.Mangesh Ghiware2012-04-111-21/+22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add null checks for m_baseLayer. Refactor common code to a separate getLayerTransform() function that returns a draw tranform ptr. Bug: 6239165 Change-Id: I7c2079e58b49c10a780b099fea9e3d7959b7fe00
* | | | | Merge "Unify composited layer/base layer draw path"Chris Craik2012-04-116-99/+6
|\ \ \ \ \
| * | | | | Unify composited layer/base layer draw pathChris Craik2012-04-106-99/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple paths were redundant, as they both synchronized the layers, and drew the base if needed. depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/179964/ largely reverts 3adbe453816c9282bfe1d212e813661ce2590955 Change-Id: Ic60f79521dc62e7c2281302bc51a3dfde16d396f
* | | | | | Merge "Sort surface drawing order by Z value"Chris Craik2012-04-112-2/+19
|\ \ \ \ \ \
| * | | | | | Sort surface drawing order by Z valueChris Craik2012-04-112-2/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:6275189 Change-Id: Ib9cabadb77777244c6ef707c32ce53db3ebf3181
* | | | | | Merge "Treat image texture TileGrids as non-base surfaces"Chris Craik2012-04-112-11/+9
|\ \ \ \ \ \
| * | | | | | Treat image texture TileGrids as non-base surfacesChris Craik2012-04-102-11/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was ignoring transform calculation bug:6317028 Change-Id: I9d5d491ef9eb853535e18a8ad10ab387d77e2d80
* | | | | | Merge "Removed unused bool"Chris Craik2012-04-112-8/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed unused boolChris Craik2012-04-102-8/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug:5636249 Change-Id: Ic99ab5a386009fcfb52ceaffc4881fe2f1d8d627
* | | | | Merge "Revert "Revert "Keep selection handles in edit fields."""George Mount2012-04-103-28/+35
|\ \ \ \ \
| * | | | | Revert "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-28/+35
| | | | | | | | | | | | | | | | | | This reverts commit eb4152454774fa6e38c8be1a2810bc893d494de3
* | | | | | Merge "Expand base layer bounds to fill viewport"Chris Craik2012-04-103-1/+17
|\ \ \ \ \ \
| * | | | | | Expand base layer bounds to fill viewportChris Craik2012-04-103-1/+17
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, paint area outside the content bounds with content bg color in software rendering path. bug:6304213 Change-Id: I6fe5246e82d30fe000e570c8dccb605d46fc428d
* | | | | | Merge "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-35/+28
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Revert "Keep selection handles in edit fields."George Mount2012-04-103-35/+28
| | | | | | | | | | | | | | | | | | This reverts commit 76a09fb547aa97b2f0e9cbb1e4a800d61b30a477
* | | | | | Merge "Turn on Fence sync for transfer queue."Teng-Hui Zhu2012-04-101-1/+1
|\ \ \ \ \ \
| * | | | | | Turn on Fence sync for transfer queue.Teng-Hui Zhu2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given driver bug b/6222131 is fixed, we can turn on this sync to protect us from potential corruption and help the emulation. Change-Id: Icc6c2d8fc3d123cde972507c3261729cd912676d
* | | | | | | Merge "Keep selection handles in edit fields."George Mount2012-04-103-28/+35
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Keep selection handles in edit fields.George Mount2012-04-103-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6264769 Framework Change: I9ee89f8b1d4e6954092b8c4d677fb75b79354b36 Change-Id: Ie937a8c55da0f8aef66cfcee11beb961669b7168
* | | | | | | Merge "Revert "Add webkit plumbing for file origin policy""Selim Gurun2012-04-091-15/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Add webkit plumbing for file origin policy"Selim Gurun2012-04-091-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 960271d799b3ee4b8de483109435a9092d99c468