summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
|\
| * Remove forgotten CHROME_NETWORK_STACK macrosSelim Gurun2012-06-081-2/+0
| | | | | | | | | | | | | | | | | | Bug: 6637033 It seems that somehow these macros were forgotten to be removed while dropping http stack, it is likely a merge/rebase issue. Change-Id: I37b14488dbfd786e3e0deab9775f42f21d2205e7
* | Merge "Disable dispatchFakeMouseMoveEvent when scrolling a render layer" ↵John Reck2012-06-111-0/+2
|\ \ | | | | | | | | | into jb-dev
| * | Disable dispatchFakeMouseMoveEvent when scrolling a render layerJohn Reck2012-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6635039 This makes sense if you are scrolling the layer with an actual mouse, but all it does for us is result in some weird CSS :hover style changes and unnecessary painting - disable it. Change-Id: I08907c5f536c94a00d72fecf72411a1765a4a067
* | | 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
* | | Merge "Switch stopGL and destroy to use a passed in ptr" into jb-devJohn Reck2012-06-071-6/+7
|\ \ \
| * | | Switch stopGL and destroy to use a passed in ptrJohn Reck2012-06-071-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6569073 This is part a cleanup of destroy to eliminate the gap between finalize() and destroy() by allowing both nativeDestroy and nativeStopGL to be called statically Change-Id: I6418cfe64ca03c58d2a395a239739e1577c54dea
* | | | 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
* | | | Merge "Fix IFrame max scroll" into jb-devJohn Reck2012-06-071-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
* | | Merge "DO NOT MERGE Use scoped_refptr's rather than naked ptrs." into jb-devSelim Gurun2012-06-071-5/+5
|\ \ \
| * | | DO NOT MERGE Use scoped_refptr's rather than naked ptrs.Selim Gurun2012-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6508448 Cherry pick from master, sha: 6c9f55f6f57bd4da36053c76a1cfce8a15a00a97 This is to make sure webkit usage of scoped refptrs are compatible with chromium changes, see bug for more details. Change-Id: Ib8aa3e29409bfe6fd94ef56376bd2ff2297ec868
* | | | Remove unnecessary Android code from hitTestForLayerJohn Reck2012-06-062-32/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6613097 The bug here is that the clipping rects it is calculating are wrong, which results in the hit test failing. However, as we now actually scroll our overflow layers (which we didn't at the time this was added), this code is no longer necessary anyway. WebKit knows how to do hit tests correctly, just let it. This is a partial revert of I0da2d8db Change-Id: I7b42f36dd199d431508da934878fc0f56e76559c
* | | 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
* | | Reduce base layer false clip size to avoid rounding issuesChris Craik2012-06-052-1/+6
| | | | | | | | | | | | | | | bug:6605853 Change-Id: I65583e61197452ac70c5adf5f967182f0fd7578a
* | | 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
* | | Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
|\ \ \
| * | | 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
* | | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6594983 Change-Id: I8adf636345e5d5284e372e28176c31c7e937334d
* | | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick of WebKit r119158. Note the layout test is tweaked slighly from upstream to make it happy in our older webkit snapshot. See: http://trac.webkit.org/changeset/119158 Bug: 6578213 Change-Id: Id6cc23938b5139cf0416e3d4c6e7ba227b1b6a0c
* | | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
|\ \ \
| * | | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
| | |/ | |/| | | | | | | | | | bug:6593154 Change-Id: Ic9438f758c7c67d0a2e0579dbc53dcdf8dd109cd
* | | 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
* | Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|/ | | | | | bug:5683630 Change-Id: I4d617962a8412de884903f150799f733ea996e1c
* Merge "Don't override X-Requested-With if it is already set" into jb-devJohn Reck2012-05-301-1/+1
|\
| * Don't override X-Requested-With if it is already setJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | Bug: 6547248 Change-Id: I50490abec1ac62a94acb750182e9ae70a5a654e9
* | 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-302-2/+11
|\ \ \ | |_|/ |/| |
| * | Draw entire layer tree in capturePicture()Chris Craik2012-05-302-2/+11
| |/ | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
|\ \
| * | Consider frame offset for text snap rectangle.George Mount2012-05-292-19/+13
| |/ | | | | | | | | | | Bug 6556824 Change-Id: I2c39bf3d7461cfe21e33fd18ab798ca824cbdd96
* | 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
* | | Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
| |/ |/| | | | | | | | | | | | | | | Bug: 6557664 For now simply disable copyScrollPosition for iframes. They may jitter slightly if webkit does a tree sync while scrolling, but the copying isn't trivial due to the nature of iframe scrolling Change-Id: I816fe96b452794b3289c3a522a11447c057e9c5e
* | Compute scroll limits correctlyJohn Reck2012-05-253-17/+31
| | | | | | | | | | | | Bug: 6563848 Change-Id: I167487fab64c97b6c4ec7f1b14639415ce15e26f
* | Merge "Fix a browser crash related to HTML5 video." into jb-devTeng-Hui Zhu2012-05-251-9/+0
|\ \
| * | Fix a browser crash related to HTML5 video.Teng-Hui Zhu2012-05-251-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in fact take out the previous change based on the assumption that we only support fullscreen. https://android-git.corp.google.com/g/#/c/91062/ The reason we don't need this early return is we use user gesture to block the play() call which is not from user interaction. bug:6555273 Change-Id: I7012a81138d03a4d95fa976bac12cce833996def
* | | Merge "Copy scroll position for scrolling layer" into jb-devJohn Reck2012-05-251-21/+15
|\ \ \
| * | | Copy scroll position for scrolling layerJohn Reck2012-05-251-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6557664 Change-Id: I32aa77b6fd408dc4f1097513cbb1211184a93885
* | | | Merge "Use newest available SurfaceBacking scale when counting texture ↵Chris Craik2012-05-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | usage" into jb-dev