summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Fix up webkit to reflect Java class renamesJonathan Dixon2012-04-234-9/+9
| | | | | | | | | GeolocationPermissionsClassic CookieManagerClassic WebIconDatabaseClassic WebStorageClassic Change-Id: I3fb125ea286db55c906d80e322b06060464a8bff
* Temporarily disable functor use of kProcessModeChris Craik2012-04-201-0/+5
| | | | | bug:6365056 Change-Id: Icd0c6b4741159f5413bd697be30b244c8c701ec6
* Merge "Better handle the EGL context lost situation."Teng-Hui Zhu2012-04-2011-78/+107
|\
| * Better handle the EGL context lost situation.Teng-Hui Zhu2012-04-2011-78/+107
| | | | | | | | | | | | | | | | | | Unless framework provide a better message, we can't avoid this EGL context issue totally if mis-match happen again. Clean up some obsolete code. Change-Id: Ica03daecd58f9757c8cad41e0f40d5d51b041748
* | Merge "Revert "Revert "Add webkit plumbing for file origin policy"""Selim Gurun2012-04-191-0/+15
|\ \ | |/ |/|
| * Revert "Revert "Add webkit plumbing for file origin policy""Selim Gurun2012-04-191-0/+15
| | | | | | This reverts commit 68c1e19ccf6ea08208332b6cd19fadc5716159f5
* | Merge "fix minor warnings and style issues"Chris Craik2012-04-192-12/+3
|\ \
| * | fix minor warnings and style issuesChris Craik2012-04-192-12/+3
| | | | | | | | | | | | Change-Id: Iaa4b1abeca17df54a4ddd169a3828695b8dcc776
* | | Merge "rename audio policy output flags."Eric Laurent2012-04-181-1/+1
|\ \ \
| * | | rename audio policy output flags.Eric Laurent2012-04-181-1/+1
| |/ / | | | | | | | | | Change-Id: I2d0c6a33bc8d9bb163506cdfa7dcb25e4b54d01a
* | | Merge "prevent double TileGrid preparation"Chris Craik2012-04-187-90/+100
|\ \ \
| * | | prevent double TileGrid preparationChris Craik2012-04-187-90/+100
| |/ / | | | | | | | | | | | | | | | | | | | | | bug:6346848 also renamed TileGrid* variables for clarity Change-Id: Ie0e56a6e1e85db426c4944b03125248cd6a647c0
* | | Merge "Follow the new rule from framework about EGLContext deletion"Teng-Hui Zhu2012-04-181-2/+3
|\ \ \ | |/ / |/| |
| * | Follow the new rule from framework about EGLContext deletionTeng-Hui Zhu2012-04-181-2/+3
| | | | | | | | | | | | | | | bug:6325463 Change-Id: I303e2cf08feec110bd75c95f1de8ebc2e79f3c4c
* | | Merge "Enable point sample when the texel and pixel is 1:1 mapping."Teng-Hui Zhu2012-04-177-9/+48
|\ \ \
| * | | Enable point sample when the texel and pixel is 1:1 mapping.Teng-Hui Zhu2012-04-177-9/+48
| |/ / | | | | | | | | | Change-Id: I532ad6b038d3b141bd212c8c408533fec0e9616e
* | | Merge "Fix crash in createWindow"John Reck2012-04-171-3/+3
|\ \ \
| * | | Fix crash in createWindowJohn Reck2012-04-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6343878 frame->view()->platformWidget() is only valid on the main frame, not subframes. Fix the dialog check to use windowRect(), which handles getting the WebCoreViewBridge from the right frame Change-Id: Ia7083e2b7d54774bc33f41ac58f547c4c139c5b6
* | | | Merge "add basic webview tracing"Chris Craik2012-04-174-0/+9
|\ \ \ \
| * | | | add basic webview tracingChris Craik2012-04-164-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Id97ce1efab5918802cff5b90c0122b4cc2d7e73d
* | | | | Merge "Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash""Teng-Hui Zhu2012-04-162-14/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"Teng-Hui Zhu2012-04-162-14/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing HTML5 video to crash. bug:6342146 This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e. Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
* | | | Merge "Revert "Turn on Fence sync for transfer queue.""Chris Craik2012-04-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Turn on Fence sync for transfer queue."Chris Craik2012-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was causing ANRs bug:6325463 This reverts commit 79620b0826fdbb2f0d125042f1414391b51fc5fa
* | | | Merge "Move the common matrix computation to higher level"Teng-Hui Zhu2012-04-162-16/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Move the common matrix computation to higher levelTeng-Hui Zhu2012-04-162-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we don't need to compute the same thing for each tile any more. bug:6338456 Change-Id: I68e744ab7af2bb55a67047bc16aeb8659b26daf2
* | | | 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