summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Move the matrix support to rely on the new framework clip info"Teng-Hui Zhu2012-04-166-90/+127
|\
| * Move the matrix support to rely on the new framework clip infoTeng-Hui Zhu2012-04-136-90/+127
| | | | | | | | | | | | | | | | | | | | In this new way, we don't need to worry about the animation offset, b/c it is in the clip rect. Also add the matrix support for video layer. bug:5684832 Change-Id: I08e22ca042e425f8f7af935b60e04f2a4dbc52df
* | Merge "Fix Gradient & Pattern handling"John Reck2012-04-134-146/+45
|\ \
| * | Fix Gradient & Pattern handlingJohn Reck2012-04-134-146/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6300357 Switch to GradientSkia (fixes the crash) Fix GraphicsContextAndroid to delay setting the fill & stroke shaders until immediately before they are needed, as they can be updated between when they are set and when they are used, which SkShader doesn't support. Change-Id: I85c81ad5764495f45547d2cef08bcf7ed7a885c1
* | | Merge "only profile drawing frames"Chris Craik2012-04-131-3/+4
|\ \ \
| * | | only profile drawing framesChris Craik2012-04-131-3/+4
| | |/ | |/| | | | | | | Change-Id: I743a0bf1989572a7c48ebf9f0691c9cec9bef098
* | | Merge "remove several unneeded variables/parameters"Chris Craik2012-04-1313-33/+16
|\ \ \
| * | | remove several unneeded variables/parametersChris Craik2012-04-1313-33/+16
| |/ / | | | | | | | | | Change-Id: I862487e8700a408e9e2f7f4dc7d034674ac454d0
* | | Merge "Set initial focus"John Reck2012-04-132-0/+36
|\ \ \
| * | | Set initial focusJohn Reck2012-04-132-0/+36
| | |/ | |/| | | | | | | | | | | | | Bug: 6108927 Change-Id: I150e75a7d1c0d971db03e407a58ba28acbd6283c
* | | Merge "Separate prefetching TileGrid from front/back"Chris Craik2012-04-132-16/+29
|\ \ \ | |/ / |/| |
| * | Separate prefetching TileGrid from front/backChris Craik2012-04-122-16/+29
| |/ | | | | | | | | | | | | Can now draw all available tiles while preparing new zoom level bug:5690291 Change-Id: Ic08acc59e052d6b05d282329eed2cc526cb8f2f3
* | Merge changes Icc964ad0,Ib21562da,I87cfd2aa,I2d4208a2Steve Block2012-04-132-6/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change r107627 to fix a LayoutTest crash Cherry-pick WebKit change r94541 as a prerequisite for r107627 Cherry-pick WebKit change r88854 as a prerequisite for r107627 Cherry-pick WebKit change r106251 to fix a LayoutTest crash
| * | Cherry-pick WebKit change r107627 to fix a LayoutTest crashSteve Block2012-04-121-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html See http://trac.webkit.org/changeset/107627 Bug: 6328992 Change-Id: Icc964ad0a6eb967f56fc298577a3b4515e81e886
| * | Cherry-pick WebKit change r94541 as a prerequisite for r107627Steve Block2012-04-121-1/+15
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/94541 Bug: 6328992 Change-Id: Ib21562da28126db4d1c2898af818f8f5569236e0
| * | Cherry-pick WebKit change r88854 as a prerequisite for r107627Steve Block2012-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/88854 Bug: 6328992 Change-Id: I87cfd2aa0d76dec9b511067ba150db700d297a63
| * | Cherry-pick WebKit change r106251 to fix a LayoutTest crashSteve Block2012-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | fast/css/fontsize-unit-rems-crash.html See http://trac.webkit.org/changeset/106251 Bug: 6329315 Change-Id: I2d4208a280f71dcd2d69f5d34fae9604680abb58
* | | Merge changes Ia48c7e50,I02da7a9fSteve Block2012-04-132-2/+10
|\ \ \ | |/ / | | | | | | | | | | | | * changes: Cherry-pick WebKit change r105769 to fix a LayoutTest crash Add RenderObject::isBeforeOrAfterContent() from r94543 as a prerequisite for r105769
| * | Cherry-pick WebKit change r105769 to fix a LayoutTest crashSteve Block2012-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | fast/multicol/clone-block-children-inline-mismatch-crash.html See http://trac.webkit.org/changeset/105769 Bug: 6329129 Change-Id: Ia48c7e50adb7de3fc1e897a0de90b62a1ca63786
| * | Add RenderObject::isBeforeOrAfterContent() from r94543 as a prerequisite for ↵Steve Block2012-04-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | r105769 See http://trac.webkit.org/changeset/94543 Bug: 6329129 Change-Id: I02da7a9f891a6eec394398529f64b0992cbfce70
* | | Merge "Cherry-pick WebKit change r99731 to fix a LayoutTest crash"Steve Block2012-04-131-0/+4
|\ \ \ | |/ /
| * | Cherry-pick WebKit change r99731 to fix a LayoutTest crashSteve Block2012-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | svg/foreignObject/absolute-position-foreign-object-child-crash.html See http://trac.webkit.org/changeset/99731 Bug: 6329122 Change-Id: Ibee43b565d69507c4abace7e1ab298c660de137f
* | | Merge "Cherry-pick WebKit change r96122 to fix a LayoutTest crash"Steve Block2012-04-131-0/+5
|\ \ \ | |/ /
| * | 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
* | | Merge "Cherry-pick WebKit change r94841 to fix a LayoutTest crash"Steve Block2012-04-131-1/+1
|\ \ \ | |/ /
| * | 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
* | | Merge "Cherry-pick WebKit change r94511 to fix a LayoutTest crash"Steve Block2012-04-131-5/+10
|\ \ \ | |/ /
| * | 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
* | | Merge "Cherry-pick WebKit change r94215 to fix a LayoutTest crash"Steve Block2012-04-131-0/+2
|\ \ \ | |/ /
| * | 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
* | | Merge changes If869bd58,I18c371c9,I7c46eab4Steve Block2012-04-137-28/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change r92139 to fix a LayoutTest crash Cherry-pick WebKit change r87227 as a prerequisite for r92139 Cherry-pick WebKit change r85267 as a prerequisite for r92139
| * | 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
* | | Merge changes I0cee4daa,If526b331Steve Block2012-04-131-249/+182
|\ \ \ | |/ / | | | | | | | | | | | | * changes: Cherry-pick WebKit change r90568 to fix LayoutTest crashes Cherry-pick WebKit change r86098 as a prerequisite for r90568
| * | 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
* | | Merge "Cherry-pick WebKit change r89762 to fix a LayoutTest crash"Steve Block2012-04-132-6/+15
|\ \ \ | |/ /
| * | 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
* | | Merge "Cherry-pick WebKit change r88474 to fix a LayoutTest crash"Steve Block2012-04-131-1/+2
|\ \ \ | |/ /
| * | 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
* | | Add support for HTML Media Capture "capture" attribute.Ben Murdoch2012-04-1310-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support in WebKit for the newly specified "capture" attribute to be used on HTML file pickers. Maintains support for the legacy implementation of the API (a MIME type parameter on the 'accept' attribute) for backwards compatibility. Note the 'capture' attribute takes precedent over a MIME type parameter. See http://www.w3.org/TR/html-media-capture/#captureparam for details. Requires changes in the framework (I494adc1274ca21ce8fe52a6c7b6b758217927e66) and Browser (I38dfe2df043fdba1388384dbd3b5370737eb38e5). Bug: 5771207 Change-Id: I0a921be31fda79a43c05da4fe22d9c808d92709c
* | | Fix funky rects in some casesJohn Reck2012-04-121-2/+3
| |/ |/| | | | | | | | | Bug: 6138337 Change-Id: Ibbfee2f451a0f05c25832122e1debd53d7fce4b6
* | Merge "Minor clean-up in DeviceOrientation and DeviceMotion"Steve Block2012-04-122-5/+5
|\ \ | |/
| * 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 "Skip drawing the background (glClear) if the tiles cover it."Chris Craik2012-04-126-14/+43
|\ \
| * | Skip drawing the background (glClear) if the tiles cover it.Chris Craik2012-04-126-14/+43
| | | | | | | | | | | | | | | | | | bug:5631590 Change-Id: Ic7dc0dac0d7f98fb94eb2b111b3e59a0a7010caf
* | | Merge "Cleanup unused code"John Reck2012-04-124-143/+1
|\ \ \
| * | | Cleanup unused codeJohn Reck2012-04-114-143/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: I377753d119d74bbd2569be586d980081f78d15e7
* | | | Merge "Fix ImageTexture drawing in software path"Chris Craik2012-04-121-1/+2
|\ \ \ \