summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Code clean up.Teng-Hui Zhu2011-01-133-5/+4
| | | | | | There should be no functionality change. Change-Id: Ifc05a776ebb0a2a00b3aff194e138847ed1201cf
* Merge "The fixed element layer should not inherit the parent matrix" into ↵Teng-Hui Zhu2011-01-121-1/+3
|\ | | | | | | honeycomb
| * The fixed element layer should not inherit the parent matrixTeng-Hui Zhu2011-01-121-1/+3
| | | | | | | | | | | | | | | | The fixed element layer should start from an identity matrix. And apply local transformation. Change-Id: I9243f8c496bdbd5ee66e18b23715f9935e5574b6 b:3344290
* | Merge "The m_projectionMatrix in the ShaderProgram need to be updated" into ↵Teng-Hui Zhu2011-01-121-0/+1
|\ \ | |/ | | | | honeycomb
| * The m_projectionMatrix in the ShaderProgram need to be updatedTeng-Hui Zhu2011-01-121-0/+1
| | | | | | | | | | | | | | | | | | When there is only layers (no baseLayer), m_projectionMatrix is not updated for every draw call, such that it doesn't reflect the visibleRect info. Change-Id: I527f86d6d16034e56c3215f011c20196b02b16c2 b:3335132
* | Merge "Disable rounding hacks." into honeycombLeon Scroggins2011-01-124-0/+82
|\ \ | |/ |/|
| * Disable rounding hacks.Leon Scroggins2011-01-114-0/+82
| | | | | | | | | | Bug:3085564 Change-Id: Ie570cbac6a445a337c72466598d5550c84d803ad
* | Fix the invalidate on the layerTeng-Hui Zhu2011-01-111-1/+6
| | | | | | | | | | | | | | For each layer, if its content is dirty, it should tell the Java to redraw. Change-Id: If1fe006c0777130083ddc84778104fff35435a1b b:3327600
* | Merge "Use float to preserve scales' accuracy." into honeycombShimeng (Simon) Wang2011-01-111-6/+6
|\ \
| * | Use float to preserve scales' accuracy.Shimeng (Simon) Wang2011-01-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change helps page navigation, since the restored scale is accurate. This change has a corresponding change in frameworks/base. https://android-git.corp.google.com/g/#change,88121 issue: 3225233 Change-Id: I7e5601e8412e8b81e7f32c9ffb9e6c114db95169
* | | Merge "Prevent a crash by caching overflow scrolling." into honeycombPatrick Scott2011-01-112-21/+13
|\ \ \ | |/ / |/| |
| * | Prevent a crash by caching overflow scrolling.Patrick Scott2011-01-112-21/+13
| |/ | | | | | | | | | | | | | | | | Use adoptRef when creating a new bridge item. Use toRenderBoxModelObject instead of toRenderBox as RenderInlines have layers. Bug: 3321493 Change-Id: I4283681eba961aedaa8d80bfdfb3d1a468aab1ac
* | Merge "Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h" into honeycombShimeng (Simon) Wang2011-01-112-13/+0
|\ \ | |/ |/|
| * Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.hShimeng (Simon) Wang2011-01-072-13/+0
| | | | | | | | | | | | | | | | | | This helps scrolling to a page#anchor link as shown in the bug. Not sure I understand the reason to have that setting at the first place. issue: 3225233 Change-Id: If2960d3c77be94b150e138a534007708f025dbad
* | Merge "Fix a warning" into honeycombKristian Monsen2011-01-111-3/+3
|\ \
| * | Fix a warningKristian Monsen2011-01-101-3/+3
| | | | | | | | | | | | | | | | | | Just changing the order so they are matched in the .h and .cpp Change-Id: I88afbdded260a389da2134ccdc7946f649b8db37
* | | Cherrypick of https://android-git.corp.google.com/g/#change,88039Derek Sollenberger2011-01-101-13/+29
| | | | | | | | | | | | | | | | | | Pass multiTouch events to plugins so Adobe could try it. Change-Id: I2c1120a85ef15db0ce45161403d56843c0037abf
* | | Merge "Enable fixed layers for all websites" into honeycombNicolas Roard2011-01-102-18/+6
|\ \ \
| * | | Enable fixed layers for all websitesNicolas Roard2011-01-102-18/+6
| | | | | | | | | | | | | | | | | | | | bug:2797422 Change-Id: Ide0867a06d61a7ee92af751ae824fe6c3b23c41f
* | | | Merge "Change the transition from cross-fading to simple fading of only one ↵Nicolas Roard2011-01-101-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | of the TiledPage." into honeycomb
| * | | Change the transition from cross-fading to simple fading of only one ofNicolas Roard2011-01-101-2/+3
| |/ / | | | | | | | | | | | | | | | | | | the TiledPage. bug:3335076 Change-Id: Ia2a0de24e7c13d7cf3bbae8b17e9db1e377aa8a4
* | | Merge "Ensure that PopupReply does not take action after disconnection." ↵Leon Scroggins2011-01-102-8/+36
|\ \ \ | |/ / |/| | | | | into honeycomb
| * | Ensure that PopupReply does not take action after disconnection.Leon Scroggins2011-01-102-8/+36
| | | | | | | | | | | | | | | Bug:3326203 Change-Id: Ieec8765fae0af7d4f2b0f56167cb1b221fa73687
* | | Fix alpha compositing in the shaders to work with premultiplied alphaNicolas Roard2011-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | textures bug:3332829 Change-Id: Iffce6322fca694e85dd51dbc4147f4309f350eca
* | | Add debug infoTeng-Hui Zhu2011-01-072-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | When we have such extra info in the log, it could lead to a root cause more directly without manual adding and rebuilding. bug:3307016 Change-Id: I7699c554923d1cdc4ddeb9795ad9c89687b1f27a
* | | Redo the clippingRect calculationTeng-Hui Zhu2011-01-073-16/+21
| |/ |/| | | | | | | | | | | | | | | | | | | Although the intersetcion is done correctly, but the clippingRect should take the parents' matrix into account. To make the code cleaner, we convert all the rects into screen coordinate for intersection. bug:3304761 Change-Id: Ia3dc3e7b72f2e72eaab66ba8e017d89ab71dc468
* | Merge WebKit at Chromium 9.0.597.55: RenderFrame docWidth method changedBen Murdoch2011-01-071-3/+4
| | | | | | | | | | | | See http://trac.webkit.org/changeset/72852 Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a
* | Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-07103-130175/+2819
| | | | | | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* | Don't reflow if a RenderBlock has background color or image.Shimeng (Simon) Wang2011-01-061-1/+1
|/ | | | | issue: 3313826 Change-Id: Ic9c87880eb6f41f72319f72123cc21cc2fe623f0
* When canceling <select> popup leave the value unchanged.Leon Scroggins2011-01-061-0/+3
| | | | | | Bug:3328658 Change-Id: I70e7fa72a0f2df3957cb295efdf404fd91511610
* Merge changes ↵Steve Block2011-01-06377-73551/+68846
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Idd1eee54,I6a266e12,Iaa56a5a5,I81915808,I956ac20a,I7e999ae3,If2386201,I5ba4d097,Iac42b5b4,I5d2bb4e8 * changes: Merge WebKit at r72805: Update WebKit revision Merge WebKit at r72805: Cherry-pick WebKit change 73062 Merge WebKit at r72805: Cherry-pick WebKit change 72948 Merge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight() Merge WebKit at r72805: Undo previous conflict resolution in RenderSVGResourceSolidColor.cpp Merge WebKit at r72805: Update GraphicsContext method signatures Merge WebKit at r72805: Update EditorClient::getGuessesForWord() Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode() Merge WebKit at r72805: Fix Makefiles Merge WebKit at r72805: Initial merge by Git
| * Merge WebKit at r72805: Cherry-pick WebKit change 73062Steve Block2011-01-065-24/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is the upstreaming of local changes in WebCore/platform/network. It did not generate conflicts in the merge to r73109 as both upstream and local versions matched at r73109. But since it appears after r72805, it was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/73062 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I6a266e1270cbc1f155065ae1c56c491ccf33e497
| * Merge WebKit at r72805: Cherry-pick WebKit change 72948Steve Block2011-01-069-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes CodeGeneratorV8.pm It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm', which was inadvertantly removed as part of the initial merge by Git to r72805. See http://trac.webkit.org/changeset/72948 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
| * Merge WebKit at r72805: Update call sites to RenderFrame::docWidth()/docHeight()Steve Block2011-01-062-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This is effectively a revert of "Merge Webkit at r73109: render frame docWidth/docHeight method changed." See http://trac.webkit.org/changeset/72852 and http://trac.webkit.org/changeset/73063 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I81915808439847dce87beefdd527f77962e074b5
| * Merge WebKit at r72805: Undo previous conflict resolution in ↵Steve Block2011-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderSVGResourceSolidColor.cpp This is effectively a partial revert of "Merge Webkit at r73109: Fix conflicts" See http://trac.webkit.org/changeset/72926 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I956ac20ac4985ed69921a8efad4a351ba0034e84
| * Merge WebKit at r72805: Update GraphicsContext method signaturesSteve Block2011-01-061-20/+7
| | | | | | | | | | | | | | | | | | | | | | | | Note that this is a partial revert of "Merge Webkit at r73109: graphics method signature changed." See http://trac.webkit.org/changeset/72926 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I7e999ae384bd791c5953f5edcf494a008e6fceea
| * Merge WebKit at r72805: Use Node::parent() rather than Node::parentNode()Steve Block2011-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a revert of "Merge WebKit at r73109: use parentNode method." See http://trac.webkit.org/changeset/72825 This reverts commit 23aa22bb0c8bf0d91c99d21c5dca4c64a4825a87. Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5ba4d0976c3b87b32326fdc8e2eb1cffdd7541cf
| * Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-06385-73620/+68869
| | | | | | | | | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* | Turn off iframe flattening.Patrick Scott2011-01-061-1/+0
|/ | | | | Bug: 3304817 Change-Id: I902ba0ef0915a4546710851e2c50d13d5fd10d0b
* Merge "refine empty picture test to look for color rects"Cary Clark2011-01-061-4/+2
|\
| * refine empty picture test to look for color rectsCary Clark2011-01-051-4/+2
| | | | | | | | | | bug:3296986 Change-Id: I171435f6285f671abc9f2e38ad00ebcabb783cb3
* | Merge "clip rect fix for iframe when GL on"Teng-Hui Zhu2011-01-051-9/+7
|\ \
| * | clip rect fix for iframe when GL onTeng-Hui Zhu2011-01-041-9/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | First, for each layer, the clip rect should be intersecting with all of its parents. Then the rect should use pre-transformation info, the real transformation will handle by the clip() function. P.S: renaming variable "bounds" b/c there is a member function using the same name. bug:3304761 Change-Id: Id5d602b55da904c63b37cb5436b5bf2f5526a94f
* | Plugin API to report the onscreen visibility of the plugin.Derek Sollenberger2011-01-051-0/+2
|/ | | | | bug: 3324143 Change-Id: I4ad5837b4d79ee63bf53ce974a634d357130930e
* Merge "Remove the div element check."Patrick Scott2011-01-041-1/+1
|\
| * Remove the div element check.Patrick Scott2011-01-041-1/+1
| | | | | | | | | | | | | | This allows other elements to specify overflow. Bug: 3310376 Change-Id: I039b07aebeefa9184b56950972222ffea1ed09c7
* | Merge "Update JSDOMWindowBase to reflect recent upstreaming"Steve Block2011-01-041-5/+1
|\ \
| * | Update JSDOMWindowBase to reflect recent upstreamingSteve Block2010-12-311-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | An Android-specific modification was upstreamed in http://trac.webkit.org/changeset/74806 Bug: 3305994 Change-Id: Ie43475aa611259d2d2de39397e167e42b24434f3
* | | Fix mlb shopping site not drawing correctly.Patrick Scott2011-01-041-0/+3
| |/ |/| | | | | | | | | | | Return false in hasOverflowScroll if flattening is on. Bug: 3309139 Change-Id: Ia4c981fab26154a38e66412d7e2938da32e7d718
* | Merge "A WAR to get content showing up when GL enabled"Teng-Hui Zhu2010-12-291-2/+4
|\ \
generated by cgit v1.1 at 2025-05-31 06:08:58 +0000