summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261361-21906/+69740
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge "Minor cleanup of the DoubleBufferedTexture."Derek Sollenberger2010-10-261-7/+5
|\
| * Minor cleanup of the DoubleBufferedTexture.Derek Sollenberger2010-10-221-7/+5
| | | | | | | | Change-Id: Ie3236502942eed684ac6b4602493cbf384fe8ba0
* | Remove any scheduled painting for BaseTile that are going to be deallocated.Nicolas Roard2010-10-256-15/+74
|/ | | | Change-Id: I9f46df074fedb3b157f54b2f03b33ecc80fca9ab
* Cleanup DoubleBufferedTexture and SharedTexture classes.Derek Sollenberger2010-10-226-45/+29
| | | | | | | | | | | | The cleanup consisted of... 1. removing uneeded mutex calls 2. ensuring user's of the class fully initialize them before use 3. hiding protected variables to prevent potential misuse by subclasses There will be a follow on CL focusing on cleaning up the use of mutexes in BackedDoubleBufferedTexture. Change-Id: Ia642d54d8a5b154ac287640a07d8b2c0e5d85334
* Fix tiles starvation bug + some debug logsNicolas Roard2010-10-205-8/+27
| | | | | Bug:3112643 Change-Id: I9d5adf51dc95f44b859b107666d2c2731f37b12c
* Merge "Cleanup BaseTile and BackedDoubleBufferedTexture classes."Derek Sollenberger2010-10-208-152/+155
|\
| * Cleanup BaseTile and BackedDoubleBufferedTexture classes.Derek Sollenberger2010-10-198-152/+155
| | | | | | | | | | | | | | | | The cleanup consists of: 1. removing unused variables and functions 2. refactoring the backed texture to reduce number of exposed variables Change-Id: I8a36725f61c5ecd77b7a215ec75a7b8129bf56af
* | Merge "Fix crash in hardware accelerated webviews."Derek Sollenberger2010-10-192-0/+5
|\ \
| * | Fix crash in hardware accelerated webviews.Derek Sollenberger2010-10-192-0/+5
| |/ | | | | | | | | | | | | | | We are not freeing the baseTile objects when leaving a page and are running out of memory. bug: 3107362 Change-Id: I52539d7b94d914b9ede44715362cbde94a7c077e
* | am 15643db2: am 77ab6dc8: Don\'t force video end event when full screen ↵Shimeng (Simon) Wang2010-10-191-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | video playing is returned. Merge commit '15643db2b790d467b78582c3bad440fb42d35df1' * commit '15643db2b790d467b78582c3bad440fb42d35df1': Don't force video end event when full screen video playing is returned.
| * \ am 77ab6dc8: Don\'t force video end event when full screen video playing is ↵Shimeng (Simon) Wang2010-10-181-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returned. Merge commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55' into gingerbread-plus-aosp * commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55': Don't force video end event when full screen video playing is returned.
| | * | Don't force video end event when full screen video playing is returned.Shimeng (Simon) Wang2010-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pause instead. issue: 3102273 Change-Id: Ic4ba84a5d9f7976abbb8ff0443f1d00f4a8390f8
| * | | am 156ddd48: Add more padding round select boxes, use different assets at ↵Leon Clarke2010-10-181-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | different resolutions, use new assets and don\'t deform the arrows when stretching the select box. http://b/issue?id=2506670 Merge commit '156ddd48e9c54012469fed6e7341586e0425c3d2' into gingerbread-plus-aosp * commit '156ddd48e9c54012469fed6e7341586e0425c3d2': Add more padding round select boxes, use different assets at
| | * | Add more padding round select boxes, use different assets atLeon Clarke2010-10-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different resolutions, use new assets and don't deform the arrows when stretching the select box. http://b/issue?id=2506670 DO NOT MERGE, cherry pick to GingerBread Bug: 3101402 Change-Id: I21224922db45c1cf4585667d8fa323c6a59dd240
| * | | am 44b3c7e8: Fix media element creationNicolas Roard2010-10-181-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac' into gingerbread-plus-aosp * commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac': Fix media element creation
| | * | Fix media element creationNicolas Roard2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: I095182351ef49d5931241a50ab0880d6743659a5
| * | | am 3d57c253: Implement the audio tag in webkit -- the corresponding java CL ↵Nicolas Roard2010-10-188-33/+292
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is https://android-git.corp.google.com/g/#change,41406 Merge commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp * commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6': Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
| | * | Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-10-188-33/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#change,41406 Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
| * | | am 5013a3fb: DO NOT MERGE Implement the document.createTouch, ↵Ben Murdoch2010-10-1811-1/+147
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTouchList APIs Merge commit '5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c' into gingerbread-plus-aosp * commit '5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c': DO NOT MERGE Implement the document.createTouch, createTouchList APIs
| | * | DO NOT MERGE Implement the document.createTouch, createTouchList APIsBen Murdoch2010-10-1711-1/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick to Gingerbread to enable HTML5 video playback on some sites that look for certain APIs to determine player compatability. Do not merge. Bug: 3101402 Change-Id: Id54f4cbac23208249922c3ef44086c8d9828d32c
| * | | am 3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.Patrick Scott2010-10-071-10/+32
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65' into gingerbread-plus-aosp * commit '3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65': Revert to skia's decoder for gifs with 1 frame.
| | * | Revert to skia's decoder for gifs with 1 frame.Patrick Scott2010-10-071-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a site has a bunch of gifs, they will all be kept in memory. If the gif only has one frame, revert to using skia's decoder so that we can share the memory and use RLE encoding. Bug: 3060919 Change-Id: I3091b184ce4a8c27a264473526ce4ea83a20e74f
| * | | am e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not mergeSteve Block2010-09-134-6/+43
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917' into gingerbread-plus-aosp * commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917': Cherry-pick security fix in WebKit change 63048. Do not merge
| | * | Cherry-pick security fix in WebKit change 63048. Do not mergeSteve Block2010-09-134-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/63048 Note that this required a manual merge as we do not have http://trac.webkit.org/changeset/59988 Bug: 2986936 Change-Id: I82617a011f68aeea953000d5487f40b32dcc7c72
| * | | am 946ea101: Cherry-pick security fix in WebKit change 66052Steve Block2010-09-101-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '946ea101a7673e7f566d52b1ba81f85b75666d16' into gingerbread-plus-aosp * commit '946ea101a7673e7f566d52b1ba81f85b75666d16': Cherry-pick security fix in WebKit change 66052
| | * | Cherry-pick security fix in WebKit change 66052Steve Block2010-09-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/66052 Bug: 2986936 Change-Id: I42d1b546b328e28d8dd817c5904fa1d0ee0b759c
| * | | am 93f07dbc: Cherry-pick security fix in WebKit change 65826Steve Block2010-09-101-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp * commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd': Cherry-pick security fix in WebKit change 65826
| | * | Cherry-pick security fix in WebKit change 65826Steve Block2010-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65826 Bug: 2986936 Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b
| * | | am badca5a6: Cherry-pick security fix in WebKit change 65748Steve Block2010-09-101-3/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09' into gingerbread-plus-aosp * commit 'badca5a6d49b048c5dc9c5a847ab2d729b936b09': Cherry-pick security fix in WebKit change 65748
| | * | Cherry-pick security fix in WebKit change 65748Steve Block2010-09-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65748 Bug: 2986936 Change-Id: Idd9927f39d49b8eadd589f1513cf5210cd9dfee0
| * | | am 0a05678e: Cherry-pick security fix in WebKit change 65329Steve Block2010-09-101-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp * commit '0a05678e32a04623b93aa4d3990d14877ee80386': Cherry-pick security fix in WebKit change 65329
| | * | Cherry-pick security fix in WebKit change 65329Steve Block2010-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65329 Bug: 2986936 Change-Id: I664cc00bba4cdd68cc5e23d2566279de614f5f64
| * | | am 6dba6e09: Cherry-pick security fix in WebKit change 65280Steve Block2010-09-101-1/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp * commit '6dba6e09f232d333432972b64d0074cbee59ca7a': Cherry-pick security fix in WebKit change 65280
| | * | Cherry-pick security fix in WebKit change 65280Steve Block2010-09-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65280 Bug: 2986936 Change-Id: Ia70edaa46747536a9e7adc05493ef70a9baec610
| * | | am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090Steve Block2010-09-101-15/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e' into gingerbread-plus-aosp * commit '3f2f7e2fd4924ef8eaf542740438ede42a81732e': Cherry-pick security fix in WebKit change 65090
| | * | Cherry-pick security fix in WebKit change 65090Steve Block2010-09-091-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65090 Note that this required a manual merge due to our not having http://trac.webkit.org/changeset/60251 Bug: 2986936 Change-Id: I035ec5d92c4e31cc8f7667dfc46e22d2a02cda97
| * | | am e1d3e323: Cherry-pick security fix in WebKit change 64293Steve Block2010-09-101-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83' into gingerbread-plus-aosp * commit 'e1d3e323642600e02d50760bd7dacd11e4ccfa83': Cherry-pick security fix in WebKit change 64293
| | * | Cherry-pick security fix in WebKit change 64293Steve Block2010-09-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/64293 Bug: 2986936 Change-Id: I2b4e9d218909872260e031032356b02038b73ced
| * | | am da4ffba3: Cherry-pick security fix in WebKit change 64077Steve Block2010-09-101-9/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'da4ffba387f70730453d4533272dd55870dd81bb' into gingerbread-plus-aosp * commit 'da4ffba387f70730453d4533272dd55870dd81bb': Cherry-pick security fix in WebKit change 64077
| | * | Cherry-pick security fix in WebKit change 64077Steve Block2010-09-091-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/64077 Bug: 2986936 Change-Id: Ic3e825e880f2094f274758af93a0949b0b9278f0
| * | | am 237faca5: Cherry-pick security fix in WebKit change 63773Steve Block2010-09-103-9/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091' into gingerbread-plus-aosp * commit '237faca5ff0377c7fda5c4dcc0f287e67fe66091': Cherry-pick security fix in WebKit change 63773
| | * | Cherry-pick security fix in WebKit change 63773Steve Block2010-09-093-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/63773 Bug: 2986936 Change-Id: I5536ceeee25b07476a92e4531862c7c9d7beb6c8
| * | | am 440c0366: Cherry-pick security fix in WebKit change 63772Steve Block2010-09-101-1/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7' into gingerbread-plus-aosp * commit '440c0366ae0192fb737c7dd87dc2d7156266b3f7': Cherry-pick security fix in WebKit change 63772
| | * | Cherry-pick security fix in WebKit change 63772Steve Block2010-09-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/63772 Note that this is only a partial cherry-pick. I don't think that the fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as we don't have this method in our version of WebKit. The method was added in http://trac.webkit.org/changeset/60201). Attempting to make the fix without this change, or cherry-picking this change too, would be too high risk. Bug: 2986936 Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1
| * | | am be2b5a3f: Cherry-pick security fix in WebKit change 62873Steve Block2010-09-101-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631' into gingerbread-plus-aosp * commit 'be2b5a3fe0063db46087ef38f78a1e2aa7b47631': Cherry-pick security fix in WebKit change 62873
| | * | Cherry-pick security fix in WebKit change 62873Steve Block2010-09-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/62873 Bug: 2986936 Change-Id: I8353bade3fb14aedeaa517e6bc8331cd05ee3fd8
| * | | am d8dd893d: Cherry-pick security fix in WebKit change 62271Steve Block2010-09-101-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp * commit 'd8dd893d690e9d208fe4a71b7d62374687d279f4': Cherry-pick security fix in WebKit change 62271
| | * | Cherry-pick security fix in WebKit change 62271Steve Block2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/62271 Bug: 2986936 Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e
| * | | am eea24577: Cherry-pick security fix in WebKit change 62134Steve Block2010-09-102-5/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'eea2457721313546f0b5ddab3836282e338847b9' into gingerbread-plus-aosp * commit 'eea2457721313546f0b5ddab3836282e338847b9': Cherry-pick security fix in WebKit change 62134
generated by cgit v1.1 at 2024-06-30 21:36:03 +0000