summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Show layer tree in hierarchyviewer"John Reck2012-06-149-121/+147
|\
| * Show layer tree in hierarchyviewerJohn Reck2012-06-149-121/+147
| | | | | | | | Change-Id: I2a53b157d40c630e7ca1361f8e0c8aca1d6e8a4e
* | Add detailed tracing to tile paintingChris Craik2012-06-137-1/+37
|/ | | | | bug:6653638 Change-Id: I839917feb1803bc1f4ace5aa2367067024a18706
* am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-121-7/+7
|\ | | | | | | | | * commit '101ff140ede0e7b633699bdb98bddd25b17b6eb2': Call the right updatePositions*
| * Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-121-7/+7
| |\
| | * Call the right updatePositions*John Reck2012-06-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6634077 Software was accidentally calling the inner updatePositions instead of the outer updatePositions which the hardware path calls. Move the inner updatePositions to be protected instead of public to guard against this in the future as well. Change-Id: Ib509f151ce64bf390383eaa0c32a2bae89428e89
* | | am d09512ae: am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ | |/ / | | | | | | | | | * commit 'd09512ae937be11ff906a1e2482c9b7166b45f73': Workaround double blit failure
| * | Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| |\ \
| | * | Workaround double blit failureChris Craik2012-06-123-0/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue occurs on Stingray where calling glTexSubImage2d in order to blit an update to a texture fails silently if the texture has already been updated this frame. With this change, we now draw the tile off-screen to work around the issue just before the second blit is required. This way, the second blit succeeds. bug:6630040 Change-Id: I07213954669b0f3d3f5b87a748a591e532b097b4
* | | am 45476c6e: am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '45476c6e0ef00a22165e498b3a8d673d46b6d1c6': Crash fix by checking null pointer
| * | Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| |/ | | | | | | | | | | | | bug:6579681 Regression from https://android-git.corp.google.com/g/#/c/197452/ Change-Id: If185faec6bb2d014c304afbb8ff752ebfc6e4b51
* | am fa20fc4f: am 6cb37392: Merge "Make sure we gather the textures before any ↵Teng-Hui Zhu2012-06-081-3/+4
|\ \ | |/ | | | | | | | | | | prepare work" into jb-dev * commit 'fa20fc4fef9665f0f079850c1e2cd8a2f149b72a': Make sure we gather the textures before any prepare work
| * Merge "Make sure we gather the textures before any prepare work" into jb-devTeng-Hui Zhu2012-06-081-3/+4
| |\
| | * Make sure we gather the textures before any prepare workTeng-Hui Zhu2012-06-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The available tile textures pool is not updated while we try to prepare image. This can lead to getting obsolete tile textures. bug:6613009 Change-Id: I0170f0cfba197c7a7ed48866028b30075417af30
* | | am dda8bbad: am b44cdc90: Merge "Add fast drawing path for repeat background ↵Teng-Hui Zhu2012-06-079-49/+253
|\ \ \ | |/ / | | | | | | | | | | | | | | | image." into jb-dev * commit 'dda8bbad2e0483e97c8b8640503800c495cdfbdb': Add fast drawing path for repeat background image.
| * | Merge "Add fast drawing path for repeat background image." into jb-devTeng-Hui Zhu2012-06-079-49/+253
| |\ \ | | |/
| | * Add fast drawing path for repeat background image.Teng-Hui Zhu2012-06-079-49/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the slow draw path, we are drawing the small background image one by one. Now in the fast path, we can use the GL shader to repeat the iamges. bug:6579681 Change-Id: I8ab413bdd073cb867002b77b36d4a1361290ecb2
* | | am 39a00d5f: am 2de717d2: Merge "Fix IFrame max scroll" into jb-devJohn Reck2012-06-071-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '39a00d5f9095f6e8ef9480ae9fa40857f0868117': Fix IFrame max scroll
| * | Fix IFrame max scrollJohn Reck2012-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | Bug: 6628376 m_scrollLimits has the correct max scroll range, even for iframes Change-Id: Id6f23e23652e38fe6df8d6540977dc0ab7e8d332
* | | Revert "Revert "Fix hardcoded font path. Allow adding new font path thru ↵Billy Hewlett2012-06-071-49/+17
| | | | | | | | | | | | | | | Skia changes. Includes patch which fixes merge issue"" This reverts commit 510522906e1167a59e862557d6ad04159e6ad8bd
* | | Revert "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-17/+49
| | | | | | | | | | | | | | | changes. Includes patch which fixes merge issue" This reverts commit 74af3f4571f2501ed4fdd9da928db0644acc3f6c
* | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-071-49/+17
| | | | | | | | | | | | | | | | | | | | | Includes patch which fixes merge issue Bug: 6609231 Change-Id: Ib802981fd077fb733a224addfd5aad3046b96cca
* | | Merge "Revert "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-15/+47
|\ \ \ | | | | | | | | | | | | changes. Bug: 6609231""
| * | | Revert "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-15/+47
| | | | | | | | | | | | | | | | | | | | changes. Bug: 6609231" This reverts commit ca140956b75684db0cb9609af79b8e8956ae770a
* | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-47/+15
|\ \ \ \ | |/ / / | | | | | | | | changes. Bug: 6609231"
| * | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-041-47/+15
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6609231 Change-Id: I3ecaf2bc8c560588f38f4c3a49ede7fadd1ee81c
* | | | am 3b9c97dd: am 7da43ef8: Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '3b9c97dddec1d7be0c22d97cf2bcd224e2c4f23e': Fix fake bold for fallback fonts.
| * | | Merge "Fix fake bold for fallback fonts." into jb-devVictoria Lease2012-06-053-2/+16
| |\ \ \
| | * | | Fix fake bold for fallback fonts.Victoria Lease2012-05-313-2/+16
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With no knowledge of the actual SkTypeface used to render text before render-time, the best we can do is turn fake bold on for all text and simply ignore it at render-time if the SkTypeface's style is bold. Also the complex FontPlatformData hashing mechanism needed to account for fake styles, as the versions of FontPlatformData with fake styles enabled are otherwise indistinguishable from the normal style version Bug: 6522642 Change-Id: Ic0e9f1bbd8cae9fdd3a6d1d015bb9224c8be545c
* | | | am 16a85ada: am d3fa9c80: Reduce base layer false clip size to avoid ↵Chris Craik2012-06-052-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | rounding issues * commit '16a85ada902e896fca5d91e258d0ab0f2f4c0250': Reduce base layer false clip size to avoid rounding issues
| * | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | | | | | | | | | | | | | | | | | | | bug:6605853 Change-Id: I65583e61197452ac70c5adf5f967182f0fd7578a
* | | | am a70a7851: am 988183e3: Size change on the base surface invalidates the ↵Chris Craik2012-06-051-8/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | larger of the new/old dimensions * commit 'a70a7851d9c5daeef242cb9e6641dfcc449324c3': Size change on the base surface invalidates the larger of the new/old dimensions
| * | | Size change on the base surface invalidates the larger of the new/old dimensionsChris Craik2012-06-041-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where tiles outside the new bounds weren't invalidated, as the layer shrank in one dimension. bug:6609350 Change-Id: I1f6715670654c9e6211dbec71875aa2ea11cd8f8
* | | | am c2973319: am 06100d01: Merge "Disable clipping on the base surface" into ↵Chris Craik2012-06-022-11/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'c29733197c3c7e09fb276016a8b492412ca9e64f': Disable clipping on the base surface
| * | | Disable clipping on the base surfaceChris Craik2012-06-012-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base surface can expand dynamically (see BaseLayerAndroid::updatePosition) to fill the viewport, so disable clipping on it. bug:6593707 Change-Id: I3afafb28fbe95d3162c76f8e835932577ded65ce
* | | | am 9af7514f: am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9af7514f84d41c3aa4add011ef0ffe5af04e7143': Don't allow merging within an animated layer
| * | | Don't allow merging within an animated layerChris Craik2012-05-312-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also isolates layer translation fudging so as to not affect child transforms. bug:6585341 Change-Id: If416c6fad90ee37fbe3438e01706b34e683165b7
* | | | am b1005282: am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'b10052827bf3e6263912013b2daaf928a63508e8': Fix animation in single surface mode
| * | Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| |/ | | | | | | | | | | bug:5683630 Change-Id: I4d617962a8412de884903f150799f733ea996e1c
* | am 5ce4bd8d: am db590796: Merge "Minimize tearing for fixed element in ↵Teng-Hui Zhu2012-05-306-12/+28
|\ \ | |/ | | | | | | | | | | single surface mode" into jb-dev * commit '5ce4bd8decc0c23f3727397652e4b9d9193f6d3e': Minimize tearing for fixed element in single surface mode
| * 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
* | | am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ↵Chris Craik2012-05-301-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-dev * commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
| * | 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
* | | am 1d51221c: am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" ↵John Reck2012-05-293-2/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-dev * commit '1d51221cb2f00354a8d78776caaaa04347e9b61b': Don't use setupPaintFill for drawBitmap
| * | 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
* | | am 07e81ac8: am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '07e81ac8f155f768bd769b95efd758c6acb9d6a6': Fix for wrong positioning
| * | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| | | | | | | | | | | | | | | bug:6560078 Change-Id: I1ef7b3e6398f1cb9a80027a6917d9a557deb8c6f