summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fix use of DBG_SET_LOG in WebViewCore.Mangesh Ghiware2012-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the debug build. Change-Id: I49b932ec26152d8ade19230e3be0f6a25eb8068b
* | | | | | | | | | Merge "Move mouse on hit detection"John Reck2012-01-121-9/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move mouse on hit detectionJohn Reck2012-01-121-9/+10
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we do a hit test move the mouse instead of just updating m_mousePos Change-Id: Ic7c4dae14e5d93652eed48a040c8d610ae7c8aed
* | | | | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-121-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use audio_format_t consistentlyGlenn Kasten2012-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e5f10adb2d4cd2b5421505761fe02bb6d638ab6
* | | | | | | | | am dc9c9187: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | * commit 'dc9c918705707699f236b003529005d10236772a':
| * | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: Ia3e059c74ee6039f1e8a1c9977987865f1156df6
| | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge "Initial NavCache removal"John Reck2012-01-114-157/+225
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Initial NavCache removalJohn Reck2012-01-114-157/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id34d3be6b11c4ba77b59dd9fb01a9cc050d581f6
* | | | | | | | | | resolved conflicts for merge of 9cb81f0f to masterChris Craik2012-01-111-20/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | Change-Id: I48fe99559230a14d29821d40369ad762d79ba04a
| * | | | | | | | am b627d5bd: Fully invalidate the pictureset when content size changesChris Craik2012-01-111-21/+14
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b627d5bd0e9b9a4d02131ef694467bfb62b9fb7f': Fully invalidate the pictureset when content size changes
| | * | | | | | | Fully invalidate the pictureset when content size changesChris Craik2012-01-101-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5759299 Webkit invals aren't correct when the content size changes (even simply growing vertically), for now just repaint from scratch in that case. Change-Id: I408b289bfee1139d6c8f3c7babd963d217cb5bc0
* | | | | | | | | Merge "Native function to support restore the media player state"Teng-Hui Zhu2012-01-112-0/+20
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Native function to support restore the media player stateTeng-Hui Zhu2012-01-102-0/+20
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nativeRestoreState will call java side to start to play if the native side think the player is still playing. Currently used when switching from inline mode to full screen mode. bug:5765848 framework change: https://android-git.corp.google.com/g/#/c/157864/ Change-Id: I481584ef8764d0d655f242427daa59335673e6fe
* | | | | | | | Fix code including Chromium headers to use WebKit LOG macro, rather than ↵Steve Block2012-01-111-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework LOG macro Previosuly, the framework, WebKit and Chromium all defined a LOG macro. Logic in ChromiumIncludes.h made sure that LOG always referred to the framework implementation. The framework LOG macro has now been renamed ALOG (b/5449033), so we should update this logic to make LOG refer to the WebKit implementation. Bug: 5449033 Change-Id: Ia4793114a8ec0d9da7cbbd261093b73dd9657c93
* | | | | | | | Simplify workaround for LOG_ASSERT conflictSteve Block2012-01-111-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id96b88951fb574a7ab67bd8c5a310d4770111d0e
* | | | | | | | Disable C++0x compatibility warningsSteve Block2012-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit is not currently C++0x compatibile and we have no plans to fix this downstream. We can remove this if and when it is fixed upstream. Change-Id: I255e5fcebc3a79d500b0c66eba1fa6c6f5088307
* | | | | | | | Avoid LOG_ASSERT conflicts between the framework and Chromium in AOSPSteve Block2012-01-111-0/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AOSP defines LOG_ASSERT as well as ALOG_ASSERT, and the former conflicts with Chromium's LOG_ASSERT. We need to work arund this until LOG_ASSERT is removed from the framework in AOSP. Change-Id: I8357486bfd17ea9deb402d07485e8834571f6a22
* | | | | | | Merge "A better fix to reduce overhead of GL texture wrap setting"Teng-Hui Zhu2012-01-101-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | A better fix to reduce overhead of GL texture wrap settingTeng-Hui Zhu2012-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5849461 Setting the wrap at creation time can keep the function while reducing the overhead of calling this during every draw. The regression is caused by commit 3fbe109c183e8a6e5a5f48c052923e382234d9d1. Change-Id: Ifd321b43251f919c1fa2adc30af67802db61c5aa
* | | | | | | Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"Steve Block2012-01-1022-299/+289
|\ \ \ \ \ \ \
| * | | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-1022-299/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157519 Bug: 5449033 Change-Id: Icaed25ccf4d689b533101e966e8303810b61b0d4
* | | | | | | | Merge "Revert a temporary WAR before ICS open source"Teng-Hui Zhu2012-01-101-4/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Revert a temporary WAR before ICS open sourceTeng-Hui Zhu2012-01-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now ICS is open source, we should be able to remove this now. bug:4986875 Change-Id: I24a7b31dcdc3eee0cc80aea5e66e1d420686bbce
* | | | | | | | Draw GLExtras for each layer.Victoria Lease2012-01-0910-50/+109
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5747765 Moved the GLExtras::drawGL() call out of GLWebViewState into LayerAndroid and BaseLayerAndroid. This allows us to apply per-layer transforms, ensuring that find-on-page highlights are positioned correctly on their layers. Change-Id: I65b950875eb736601f8afec1770e5cc0201c0450
* | | | | | | Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block2012-01-0914-39/+39
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0814-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I4de9cd9a3bc462c4aead1fbcd4ac0f426556bc59
* | | | | | | Merge "Fix delete key with ContentEditable fields."George Mount2012-01-092-2/+64
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix delete key with ContentEditable fields.George Mount2012-01-092-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5806859 Add deleteSurroundingText to webViewCore to support deleting multiple characters from ContentEditable fields. Framework change: I18606014 Change-Id: Ic938d6fa4818bab4bc4188c026b6897d46564255
* | | | | | | Merge "When loading progress is running, ask for redraw"Teng-Hui Zhu2012-01-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | When loading progress is running, ask for redrawTeng-Hui Zhu2012-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can smooth the animation of the loading progress. Otherwise, loading progress can look choppy. Change-Id: I05c2b70f7172e9a05edce7610675719b830949dd
* | | | | | Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI."George Mount2012-01-061-189/+223
|\ \ \ \ \ \
| * | | | | | Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.George Mount2012-01-051-189/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5827817 Added a nativeClass parameter to all appropriate JNI methods and used it instead of GET_NATIVE_VIEW to reduce JNI overhead. Framework Change: I49c7ecfd Change-Id: I02004fe10a6513d46a51ba4c630d47499d954223
* | | | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-063-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: Ia6cf33690679476e7d39c63fa59505491217fdde
* | | | | | | Merge "Fix off-by-border RTL initial scrolling."George Mount2012-01-051-3/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix off-by-border RTL initial scrolling.George Mount2011-12-201-3/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5774511 Change-Id: I8bfbc07750a129916ee804d6e1cfc1eb11288dc0
* | | | | | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I46d68746801019310494afde8769e5cc908bc835
* | | | | | | | am f6eccb79: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | * commit 'f6eccb799100e9b8b94bd9e9e33b8a30e63b32f8':
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: Ie2281e8fe54d8934b4caab74b6040bb786bb3af6
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | am 00efa06c: (-s ours) am f62e398f: Merge "Enable History API. Do not ↵Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge." into ics-mr1 * commit '00efa06c5dfaed2d9054aaf9cd5c048a80d4b148': Enable History API. Do not merge.
| * | | | | | am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f62e398f3b87d76e44d18441fa090c18dcc8be82': Enable History API. Do not merge.
| | * | | | | Merge "Enable History API. Do not merge." into ics-mr1Bart Sears2012-01-041-0/+7
| | |\ \ \ \ \
| | | * | | | | Enable History API. Do not merge.Ben Murdoch2012-01-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3 The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ib7374e0145c581588990baec6e67025c1b7ef693
* | | | | | | | am 0d647bc2: (-s ours) am d13df54b: Merge "Fix crash with composited layers ↵Bart Sears2012-01-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" into ics-mr1 * commit '0d647bc28cc93eef51ec61acd0bb6e445eb2c276': Fix crash with composited layers - DO NOT MERGE
| * | | | | | | am d13df54b: Merge "Fix crash with composited layers - DO NOT MERGE" into ↵Bart Sears2012-01-043-4/+51
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'd13df54b67ff2373e79cf6c70bd2369e556ec9c0': Fix crash with composited layers - DO NOT MERGE
| | * | | | | | Merge "Fix crash with composited layers - DO NOT MERGE" into ics-mr1Bart Sears2012-01-043-4/+51
| | |\ \ \ \ \ \
| | | * | | | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-033-4/+51
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick from master When we have composited layers inside iframes/frames, the layers hierarchy is not always up to date at the time of the layerSync() call. If some of those layers are scheduled to be repainted, the repaint operation will triggers the update of the composited layers tree -- possibly resulting in the deallocation of the very same GraphicsLayer we were painting from, and thus leading to a crash. The fix consist in gathering all the root RenderLayer (for each frame containing composited layers) and explicitely asking RenderLayerCompositor to check if the composited tree needs to be updated, before we traverse the tree to paint the elements. bug:5695185 Change-Id: I33a00b847eb19c9aa4b68f0ac3adbe36709ed00b
generated by cgit v1.1 at 2025-10-16 22:51:23 +0000