summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fix scrolling on sites that use <frame>sMangesh Ghiware2012-03-191-4/+12
| | | | | | | | | | | Update the dimensions of a frame before expanding it to fit the content width and height. Also, force a relayout of the frame as necessary to sync the correct dimensions (i.e. when navigation occurs inside the frame) Bug: 5978268 Change-Id: Ia282d6e5753fd38b32854e01ca58fa41b3814b21
* Fix layers ordering issue with Absolute positioned elementsNicolas Roard2012-03-132-49/+60
| | | | | | | | | - Promote absolute positioned elements to be composited - Reorder the elements as needed in LayerAndroid - Simplify fixed elements composition culling (don't do it anymore, we just promote everything and let the Layers sort things out) Change-Id: If76cf76a92410dec7e305a1a70c660d8597e399a
* UI-side layer mergingChris Craik2012-03-072-1/+15
| | | | | | | | Merge multiple painted layers into a LayerGroup to share a dualTiledTexture see LayerAndroid::canJoinGroup() for merging rules Change-Id: I5f5b156894c3743825f570b47d34e905d74de10a
* am 797ef404: am c892a72d: am 538b01d6: Cherry-pick WebKit r100677 to fix a ↵Steve Block2012-02-281-8/+13
|\ | | | | | | | | | | | | rendering crash * commit '797ef40436bbd0876936c82037ce7aa8d520933d': Cherry-pick WebKit r100677 to fix a rendering crash
| * Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| | | | | | | | | | | | | | | | This fixes a crash from positioned generated content under run-in. See http://trac.webkit.org/changeset/100677. Bug: 6079158 Change-Id: I3d2012c58f47e71ae500e33551dfab5587b84534
* | Merge "Merge webkit change to reveal last character in password."George Mount2012-02-282-3/+77
|\ \
| * | Merge webkit change to reveal last character in password.George Mount2012-02-282-3/+77
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6083915 cherry pick of webkit 93656 http://trac.webkit.org/changeset/93656 Change-Id: I1f979a3b2b9916736f3785ab2d5998b958b55cd2
* | | Merge "Fix iframe webkit positioning"Nicolas Roard2012-02-271-3/+19
|\ \ \ | |/ / |/| |
| * | Fix iframe webkit positioningNicolas Roard2012-02-271-3/+19
| | | | | | | | | | | | Change-Id: I7b2b3a7312c89bc505d7f629380df0d3f24eee5f
* | | draw inactive find-on-page matches as outlinesVictoria Lease2012-02-231-0/+4
| | | | | | | | | | | | Change-Id: Iacbeba1fb4e3c63f8f40c61c8b641c0b6c704cad
* | | Fix overflow clipping of images in auto-fit mode.Mangesh Ghiware2012-02-231-0/+4
|/ / | | | | | | | | | | | | | | | | | | In auto-fit mode, text is wrapped based on screen width. However, if overflow isn't visible for the content box, and it includes block elements, they may get clipped. Disable overflow clipping in this scenario. Bug: 6034321 Change-Id: I1e274df3b5698fb4142e2f0ae4c68578e26d2af4
* | Move Canvas elements to their own composited layerNicolas Roard2012-02-212-0/+11
| | | | | | | | | | | | | | | | | | This drastically improves performances, as invalidating a canvas will only touch that one layer instead of (possibly) invalidating the entire PictureSet. bug:5247823 Change-Id: Iec4de74d25e58e63f0198bbd7558c461d9a11cfd
* | Merge "Reduce the number of the composited layers."Chris Craik2012-01-251-1/+13
|\ \
| * | Reduce the number of the composited layers.Chris Craik2012-01-121-1/+13
| | | | | | | | | | | | | | | bug:5660814 Change-Id: I2205ba44c33cb7424fcd7f18648bd20d8ced07e8
* | | Remove ANDROID_CSS_RINGJohn Reck2012-01-183-84/+0
| | | | | | | | | | | | Change-Id: I7395a5f17b0ccfe8dafcc97fa3ab8897676608e9
* | | am 03eb7752: am 3c049d2a: Prevent infinite loop when turning on then off ↵Nicolas Roard2012-01-131-0/+14
|\ \ \ | |/ / |/| / | |/ | | | | | | composited mode * commit '03eb77527d30a22d267944a86c9336351d6020b5': Prevent infinite loop when turning on then off composited mode
| * Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-121-0/+14
| | | | | | | | | | bug:5820635 Change-Id: I24b6eae6c76c29e44106b4ec87e74d945aad7b1b
* | fix layer scrollingMichael Kolb2011-12-161-0/+3
| | | | | | | | | | | | | | | | | | Bug: 5774119 Add support for layer scrolling; also fixes the scrollTop demo referenced in bug: 5748199 Change-Id: Id04a3d52bb1e75e9ee24a4f1b8aa9b0334369ba1
* | am f912aaa3: am 599c05f3: Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
|\ \ | |/ | | | | | | * commit 'f912aaa3c8084eccb0f5fcb74606063d9ce5c74b': Revert "Put canvas on a layer"
| * Merge "Revert "Put canvas on a layer"" into ics-mr1John Reck2011-12-132-7/+1
| |\
| | * Revert "Put canvas on a layer"John Reck2011-12-132-7/+1
| | | | | | | | | | | | Bug: 5712065 This reverts commit 35e0b8dd7902e92f50ede4df2e4bad4ed581b770
* | | Fix the repaint inval mechanism for layers - cherry-pick from MR1Nicolas Roard2011-12-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only keep the scrollable layers invalidating their entire area instead of incurring this penalty for *all* layers. Also remove unnecessary repaint when scrolling (we have the entire content on the UI side already). While the entire scrollable area will be invalidated and marked as dirty, the existing code in PaintedSurface already only look at the visible tiles of scrollable layers to consider the layer's content as being ready to display, so the real world penalty (while far from optimal) is limited. Implementing the correct approach (only invalidating what really changed on scrollable layers) would sadly be a lot more complex, as currently webkit will *not* send us the repaint invals if they are on a currently clipped area, as webkit's default behaviour to implement scrolling of such element is to repaint them anyway... bug:5721618 Change-Id: I9af240d5f42f00f9ab07710e43ef8d72dfaf8155
* | | am e50c6da1: Merge "Revert change that caused text in floating divs to not ↵Mangesh Ghiware2011-12-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | reflow." into ics-mr1 * commit 'e50c6da15806ff91b5e9298cb303f2b8f9ae6b35': Revert change that caused text in floating divs to not reflow.
| * | Merge "Revert change that caused text in floating divs to not reflow." into ↵Mangesh Ghiware2011-12-071-1/+1
| |\ \ | | | | | | | | | | | | ics-mr1
| | * | Revert change that caused text in floating divs to not reflow.Mangesh Ghiware2011-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 5455817 (Text reflow not working in browser) Change-Id: I2a62a7fb4c7acde640cd87b8d0f03200b8f7fc2f
| * | | Fix the repaint inval mechanism for layers - DO NOT MERGENicolas Roard2011-12-071-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only keep the scrollable layers invalidating their entire area instead of incurring this penalty for *all* layers. Also remove unnecessary repaint when scrolling (we have the entire content on the UI side already). While the entire scrollable area will be invalidated and marked as dirty, the existing code in PaintedSurface already only look at the visible tiles of scrollable layers to consider the layer's content as being ready to display, so the real world penalty (while far from optimal) is limited. Implementing the correct approach (only invalidating what really changed on scrollable layers) would sadly be a lot more complex, as currently webkit will *not* send us the repaint invals if they are on a currently clipped area, as webkit's default behaviour to implement scrolling of such element is to repaint them anyway... bug:5721618 Change-Id: Ia470157c716fa1c557e4a196ba014296ad9e627a
* | | am 42e97318: Merge "A WAR to enable the slider touch event on youtube.com" ↵Bart Sears2011-11-301-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr1 * commit '42e973186ecf6f1a040f14b7169bb99e0f100563': A WAR to enable the slider touch event on youtube.com
| * | Merge "A WAR to enable the slider touch event on youtube.com" into ics-mr1Bart Sears2011-11-301-0/+7
| |\ \
| | * | A WAR to enable the slider touch event on youtube.comTeng-Hui Zhu2011-11-221-0/+7
| | | | | | | | | | | | | | | | | | | | bug:5520141 Change-Id: Ib346c42037f68b5e8303f0c61196fb28e698f7c9
* | | | am 807ee5ec: Merge "synchronize animation starts with webkit" into ics-mr1Chris Craik2011-11-301-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '807ee5ec662a7864dee505040ade9a9b3eab143c': synchronize animation starts with webkit
| * | | synchronize animation starts with webkitChris Craik2011-11-291-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | bug:5239801 this better supports animations not synchronous with webkit Relies on the frameworks/base CL: https://android-git.corp.google.com/g/#/c/152533/ Change-Id: Ia79a475065b3891db8fc4014559062ab1ac95ebe
* | | am 64797036: Merge "Put canvas on a layer" into ics-mr1John Reck2011-11-282-1/+7
|\ \ \ | |/ / | | | | | | | | | * commit '647970367ac56d95e84fbfca92d8b7390d5d2fed': Put canvas on a layer
| * | Put canvas on a layerJohn Reck2011-11-282-1/+7
| | | | | | | | | | | | | | | | | | Bug: 5666191 Change-Id: I30708d508b7e05e8bcbc6c22413134ca378f6d2c
* | | am 7839f0a8: Fix SVG text renderingSteve Block2011-11-241-0/+20
|\ \ \ | |/ / | | | | | | | | | * commit '7839f0a8c60340239148921eb35c3e2afc750701': Fix SVG text rendering
| * | Fix SVG text renderingSteve Block2011-11-241-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android's implementation of GraphicsContext::setCTM() is broken, because Skia's Picture mode does not support setMatrix(). This broken code was added in https://android-git.corp.google.com/g/#/c/112636 as part of the merge to WebKit r80534. This change modifies SVGInlineTextBox to avoid calling GraphicsContext::setCTM() and makes clear that the method should not be used. Bug: 5590123 Change-Id: I45a3c8c356b7f068bb943a45b9f10cbc041331e2
* | | am 3eaf0f8c: Force layers above overscroll/fixed elements to compositeChris Craik2011-11-231-8/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3eaf0f8cdb150a43732c8391a73046811b3c378d': Force layers above overscroll/fixed elements to composite
| * | Force layers above overscroll/fixed elements to compositeChris Craik2011-11-221-8/+0
| |/ | | | | | | | | | | | | | | | | bug:5480098 This fixes the case where they were drawn on the base layer, beneath overscroll elements. Change-Id: If9dda8c3a25cf38e777847b834ae02ec530a8000
* | am e2e7333b: Merge "Only allow stacking contexts to skip compositing" into ↵Bart Sears2011-11-181-1/+1
|\ \ | |/ | | | | | | | | | | ics-mr1 * commit 'e2e7333b68070e867d6d96f46bedd49eb85199a0': Only allow stacking contexts to skip compositing
| * Only allow stacking contexts to skip compositingChris Craik2011-11-171-1/+1
| | | | | | | | | | bug:5635942 Change-Id: Ibda67bb638d9fca5f32c85ee39c1ae1429986eda
* | Merge "Removing ANDROID_INSTRUMENTATION code"Kristian Monsen2011-11-172-11/+0
|\ \
| * | Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-172-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
* | | am d34224ca: Merge "Promote -ve z-index fixed/scrollable elements to layers" ↵Ben Murdoch2011-11-171-0/+11
|\ \ \ | |/ / |/| / | |/ | | | | | | into ics-mr1 * commit 'd34224ca67791aa7215160c7be4900f965f79eea': Promote -ve z-index fixed/scrollable elements to layers
| * Promote -ve z-index fixed/scrollable elements to layersBen Murdoch2011-11-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We normally do not necessarily promote fixed or scrollable elements to compositing layers to try and reduce the number of layers that get created. However in the case that such an element appears in the negative z-order, we must do the promotion to ensure that the layer is painted at the correct z-index in the hierarchy (i.e not too high - sites like to use a fixed image with z-index:-1 to implement a fixed background -- without this patch we end up painting the background over the main page content). Bug: 5152567 Change-Id: I36bfe14660a33d45ad54552ae41b9d7157f8dabf
| * Don't force composited layers to be stacking contexts - DO NOT MERGEChris Craik2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Cherry-pick of b8c237486bcf299d8a04bdae8d8e35fd37866172 Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | Cherry-pick WebKit change 87687 to fix debug buildSteve Block2011-10-281-0/+1
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/87687 Bug: 5448972 Change-Id: I1f2da8f5a2264ce6627dc99ebe1b235ae34f7c62
* | Merge "Don't force composited layers to be stacking contexts"Chris Craik2011-10-241-1/+1
|\ \ | |/ |/|
| * Don't force composited layers to be stacking contextsChris Craik2011-10-211-1/+1
| | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | Cherry pick 97075John Reck2011-10-204-27/+15
| | | | | | | | | | | | Bug: 5491444 Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
* | Cherry pick 94857John Reck2011-10-201-2/+7
|/ | | | | | Bug: 5491573 Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859