summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Show layer tree in hierarchyviewer"John Reck2012-06-1411-122/+239
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Show layer tree in hierarchyviewerJohn Reck2012-06-1411-122/+239
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a53b157d40c630e7ca1361f8e0c8aca1d6e8a4e
* | | | | | Add detailed tracing to tile paintingChris Craik2012-06-139-3/+40
|/ / / / / | | | | | | | | | | | | | | | | | | | | bug:6653638 Change-Id: I839917feb1803bc1f4ace5aa2367067024a18706
* | | | | Merge "Revert "Revert "Add layer clip check to hide handles when not visible."""George Mount2012-06-121-0/+23
|\ \ \ \ \
| * | | | | Revert "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-0/+23
| | | | | | | | | | | | | | | | | | This reverts commit c63158835c5027aa7245f331dc23f77cda96e192
* | | | | | am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '101ff140ede0e7b633699bdb98bddd25b17b6eb2': Call the right updatePositions*
| * | | | | Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| |\ \ \ \ \
| | * | | | | Call the right updatePositions*John Reck2012-06-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-23/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Revert "Add layer clip check to hide handles when not visible."George Mount2012-06-121-23/+0
| | | | | | | | | | | | | | | | | | This reverts commit 40369ea6114f406fef50d4241335dd8613372748
* | | | | | Merge "Add layer clip check to hide handles when not visible."George Mount2012-06-121-0/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add layer clip check to hide handles when not visible.George Mount2012-06-071-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6590742 Change-Id: Idd1ad305989ab8137597f86b4a6463e052c08a9e
* | | | | | Merge "Fix edit text capturing selection."George Mount2012-06-122-23/+24
|\ \ \ \ \ \
| * | | | | | Fix edit text capturing selection.George Mount2012-06-062-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6623128 Change-Id: Ia7a9f4bdf9478c8e1e8acb0e9f6e08d779185d11
* | | | | | | am f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK ↵Selim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macros" into jb-dev * commit 'f8b2a5a3e2f83bee801a2d19fc1073f37e95fb1f': Remove forgotten CHROME_NETWORK_STACK macros
| * | | | | | 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
* | | | | | | am a2cd3028: am efe3bf4f: Merge "Disable dispatchFakeMouseMoveEvent when ↵John Reck2012-06-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling a render layer" into jb-dev * commit 'a2cd302804f6956995bcdf0d1c3cc738e695f353': Disable dispatchFakeMouseMoveEvent when scrolling a render layer
| * | | | | | 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 "Support separation interface and implementations of WebView classes"Jonathan Dixon2012-06-081-33/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Support separation interface and implementations of WebView classesJesse Greenwald2012-06-011-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebBackForwardList and WebHistory item are now separated in the Java code. This change is for the correpsonding JNI code. Change-Id: I7358932be6cd82d8558575e953246d9d065da9c2
* | | | | | | | | 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 334b4068: am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed ↵John Reck2012-06-071-6/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ptr" into jb-dev * commit '334b406839a240e271a59a1157839bfe25c3470e': Switch stopGL and destroy to use a passed in ptr
| * | | | | | | | 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
* | | | | | | | | | 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
| * | | | | | | | | 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
* | | | | | | | | | Merge "Revert "Revert "Fix hardcoded font path. Allow adding new font path ↵Billy Hewlett2012-06-071-49/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | thru Skia changes. Includes patch which fixes merge issue"""
| * | | | | | | | | 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
* | | | | | | | | | am 110b238c: am 0d4f6046: Remove unnecessary Android code from hitTestForLayerJohn Reck2012-06-072-32/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '110b238cc7d53427764b65c9351c820743ae83a3': Remove unnecessary Android code from hitTestForLayer
| * | | | | | | | | 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 "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""
| * | | | | | | | 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
* | | | | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia ↵Billy Hewlett2012-06-071-49/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | changes. Includes patch which fixes merge issue"
| * | | | | | | | 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""