summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Minimize tearing for fixed element in single surface mode" into jb-devTeng-Hui Zhu2012-05-306-12/+28
|\
| * Minimize tearing for fixed element in single surface modeTeng-Hui Zhu2012-05-306-12/+28
| | | | | | | | | | | | bug:5683630 Change-Id: I43f738f2649a79b4ad7865ed27375c07195fa9b9
* | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-301-0/+1
|\ \
| * | Draw entire layer tree in capturePicture()Chris Craik2012-05-301-0/+1
| |/ | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | Merge "Don't use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
|\ \
| * | Don't use setupPaintFill for drawBitmapJohn Reck2012-05-293-2/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | Bug: 6505013 When drawing a bitmap, don't use setupPaintFill(). The reason is that setupPaintFill will use the fillColor to influence the alpha set on the SkPaint. However, that fillColor does not apply to the bitmap, and can have the result of applying the wrong alpha (as the alpha set is fillColor alpha * graphicsContext's alpha). Instead, set the alpha on the paint directly and use setupPaintCommon Change-Id: Ib8d7ef494593a2896e6e3ed03c00d8d4d4b7232a
* | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| | | | | | | | | | bug:6560078 Change-Id: I1ef7b3e6398f1cb9a80027a6917d9a557deb8c6f
* | Merge "Reduce UI-thread computation" into jb-devChris Craik2012-05-297-40/+24
|\ \ | |/ |/|
| * Reduce UI-thread computationChris Craik2012-05-257-40/+24
| | | | | | | | | | | | | | | | | | If the current clip covers the entire view, we don't have to calculate framework invals from swapping layers - we already draw them immediately. bug:6530473 Change-Id: I4b639e06781371e37c246f3220b79f28e7d95649
* | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| | | | | | | | | | | | Bug: 6563848 Change-Id: I167487fab64c97b6c4ec7f1b14639415ce15e26f
* | Merge "Use newest available SurfaceBacking scale when counting texture ↵Chris Craik2012-05-251-2/+2
|\ \ | | | | | | | | | usage" into jb-dev
| * | Use newest available SurfaceBacking scale when counting texture usageChris Craik2012-05-251-2/+2
| |/ | | | | | | | | | | | | | | Using m_scale would mean that while zooming out, the clipped area would get larger, but the scale would stay the same. bug:6561401 Change-Id: I0806ecb8f565c4d227a2be2b7a27a0af6aff7b46
* | Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-251-0/+1
|\ \ | |/ |/|
| * Better support for HTML5 audio loopTeng-Hui Zhu2012-05-241-0/+1
| | | | | | | | | | | | | | | | | | bug:5461143 frameworks change: https://android-git.corp.google.com/g/#/c/193751/ Change-Id: I691a8aa7eb2a7fc196358a3ab2929075bd4a8a8b
* | Merge "Compute draw transforms only for new/dynamically transformed layers" ↵Chris Craik2012-05-255-43/+63
|\ \ | | | | | | | | | into jb-dev
| * | Compute draw transforms only for new/dynamically transformed layersChris Craik2012-05-245-43/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, hundreds of layers could take 4+ ms to update transforms. Now, only those that are fixed, have animations, or are scrollable calculate transforms. bug:6530473 Change-Id: Ic9b14b76190c5bd0e5a405914a624d92b7ca7980
* | | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-247-0/+44
| | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: I8c4cd3bf4c538aff202ed0e3f84982fb112936a1
* | | Fix memory leakNicolas Roard2012-05-241-2/+2
|/ / | | | | | | | | bug:6535726 Change-Id: Id944448a9dbafa951fd3c7eab0f248380d0a5314
* | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-245-12/+14
|\ \
| * | Move scrollOffset into Layer classChris Craik2012-05-235-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Layer can now use the offset to paint, resulting in correct translates for overflow:scroll layers in the Layer::draw() path. bug:6548000 Change-Id: I1dfb88b15491e72e6c3841ce2953e114124e40fd
* | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-231-4/+7
|\ \ \
| * | | Don't set up background images if 1x1Nicolas Roard2012-05-231-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this check in other places. We still need a better solution for the general case. bug:6540356 Change-Id: I3f75c62141d7b6993928927117d972d0ec224b55
* | | | Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
|\ \ \ \
| * | | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used the surface's first layer's area, which is often incorrect in the case of significant layer merging. bug:6545187 Change-Id: Ied3e5e3cd894b145ed905f8ba83649b3c4f3b1dd
* | | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
|\ \ \ \
| * | | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | bug:6530473 bug:6344165 Change-Id: I40b190036af8c021134d5ac450e3217098ba2296
* | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove one unnecessary parameter in blitTileFromQueue. Remove syncKHR related code in TransferQueue since that is supported by SurfaceTexture. bug:6516534 Change-Id: Iaf1f46a0f459ad8973c7465a9b8550f760115384
* | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
|\ \ \ | |/ /
| * | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
| | | | | | | | | | | | | | | bug:6516534 Change-Id: Iaf62359803d65d3a9acb88aa224a1a5c42f8aa4c
* | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ | |_|/ |/| |
| * | Fix crashNicolas Roard2012-05-231-0/+2
| |/ | | | | | | | | bug:6537803 Change-Id: Ie0bb6e64644fd82c0ed6cf92c592c434f67fdc0d
* | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
|\ \ | |/ |/|
| * Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
| | | | | | | | | | | | Bug: 6509450 Change-Id: I6d952b92062e96772663824839b0229062c3a524
* | We need to clear the items even when seeing obsolete tilesTeng-Hui Zhu2012-05-221-0/+1
|/ | | | | | bug:6531360 Change-Id: Ia23ddeb56d384c4e3904cabf787bbe72be4a6f08
* Merge "Disable transform fudging for merged surfaces" into jb-devChris Craik2012-05-212-1/+8
|\
| * Disable transform fudging for merged surfacesChris Craik2012-05-212-1/+8
| | | | | | | | | | | | | | | | | | Draw transforms are used at painting time for merged surfaces, so they shouldn't be manipulated in the draw path. The fudging isn't necessary for these surfaces in the first place, as merged surfaces are always aligned to pixel coordinates. bug:6156523 Change-Id: I3d954869188008f1a9e35915df893d75b49be6a2
* | Merge "Turn off autohinting at HDPI. do not merge" into jb-devBilly Hewlett2012-05-211-0/+4
|\ \
| * | Turn off autohinting at HDPI. do not mergeBilly Hewlett2012-05-211-0/+4
| |/ | | | | | | | | | | | | cherry-pick of CL: 752753e2caf24f28dac51731ee1f1443cf511410 Bug: 6478362 Change-Id: I9734658a509010035eb3081be8affb609863d46c
* | Merge "Switch to a 4ms/1s timer" into jb-devJohn Reck2012-05-211-1/+1
|\ \ | |/ |/|
| * Switch to a 4ms/1s timerJohn Reck2012-05-181-1/+1
| | | | | | | | | | | | | | | | | | Bug: 6523124 Bug: 6523033 Use a 4ms timer for foreground tabs, and a 1s timer for background tabs Change-Id: Iea061d63adf82f6e17dd2d47d382fcdfc588b7d3
* | Fix memory leak and repaint issues with fixed background elementsNicolas Roard2012-05-184-17/+27
| | | | | | | | | | | | bug:6522485 bug:6486951 Change-Id: Ia707efed9311e4352eed3ab005ec7ca93b8444e4
* | Merge "Revert part of "Fix iframe, ..."" into jb-devMangesh Ghiware2012-05-185-1/+87
|\ \
| * | Revert part of "Fix iframe, ..."Mangesh Ghiware2012-05-185-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DOMWindow innerWidth and innerHeight to report correct values even after an orientation change. Uses platform-specific widget. This reverts part of commit I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733. Bug: 6479900 Change-Id: Ic5c8785e35b14d6723eee4f4dfe1b0a3e1ec284a
* | | Remove paint tile operations for stale paintersChris Craik2012-05-187-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | bug:6516612 also adds ClassTracker to several classes Change-Id: I9a503084240d4935fba300a3256d266a2982dcc0
* | | Merge "Cherrypick WebKit r94543." into jb-devVictoria Lease2012-05-188-5/+52
|\ \ \
| * | | Cherrypick WebKit r94543.Victoria Lease2012-05-188-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/94543 isBeforeOrAfterContent() was already pulled in from r94543 as a part of I02da7a9f891a6eec394398529f64b0992cbfce70, but we needed the rest of the patch to address our ruby text alignment issues. Bug: 6105670 Change-Id: Iad4d6308ab053488abd118eee83058cfc81e22e8
* | | | Merge "Clean up some redundant code" into jb-devTeng-Hui Zhu2012-05-182-6/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Clean up some redundant codeTeng-Hui Zhu2012-05-172-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | bug:6457191 Change-Id: Ie3ec0315151119b4428fdd97451084894f63db13
* | | | Make sure CanvasLayer isn't merged and is initialized correctlyJohn Reck2012-05-173-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6516775 Change-Id: Ifecddec18d369ba701668be85d4032918fc8d4fa