summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Support javascript to exit full screen video"Teng-Hui Zhu2012-01-173-0/+24
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Support javascript to exit full screen videoTeng-Hui Zhu2012-01-163-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When webkit side receive the webkitExitFullscreen, just send it over to the java side. framework change: https://android-git.corp.google.com/g/#/c/158653/ Change-Id: Ice2a5ea33458a8bf3e6990e288d94d5f032b0921
* | | | Merge changes Id68b9b29,I2f1a6b3d,I8cde579dRussell Brenner2012-01-171-150/+207
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Enable verbose debugging for WebHistory Refactor WebHistory Update unitTest to match current WebHistory
| * | | | Enable verbose debugging for WebHistoryRussell Brenner2012-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on logging of WebHistory read/write and activate ALOG_ASSERT. Change-Id: Id68b9b294f826f77bbfbc6f19d1e09d23cce98a1
| * | | | Refactor WebHistoryRussell Brenner2012-01-171-148/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code for reading strings and other data types has been refactored into support routines. Modified comparisons and pointer-based math to remove potential overflow errors when handling corrupted data. Remove unnecessary call to RefPtr::clear(). Bug: 5143832 Change-Id: I2f1a6b3d12cfeb2e8226e190dcd9e391609760a1
| * | | | Update unitTest to match current WebHistoryRussell Brenner2012-01-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New elements have been added to WebHistory over time without making corresponding changes to the unitTest code. This brings the test code in sync with the current WebHistory class. Change-Id: I8cde579d2820e8f5c72cf34b264ee2e57a4acbd9
* | | | | Merge "Basic code cleanup"Russell Brenner2012-01-171-114/+114
|\ \ \ \ \ | |/ / / /
| * | | | Basic code cleanupRussell Brenner2012-01-171-114/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change function names for WebKit style, from this_style() to thisStyle(). Replace terse variable names with ones that are more expressive: l => fieldLength v => vector e => encoding Move from WebKit logging (LOG_VERBOSE) to platform logging (ALOGV). Change-Id: I303bb03cb29031ae39e79c2f722c2247dbf9f888
* | | | | Merge "Honor 50 millisecond cap for WebKit JavaScript execution."George Mount2012-01-171-23/+24
|\ \ \ \ \
| * | | | | Honor 50 millisecond cap for WebKit JavaScript execution.George Mount2012-01-131-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5843118 WebKit provides a 50 millisecond cap for executing JavaScript to ensure that UI remains responsive by allowing recordContent in the WebViewCore thread to run. JavaSharedClient::ServiceFunctionPtr processes functions until they are all complete, circumventing the timeout. This CL processes only a single function and then schedules additional calls if any remaining calls exist. Change-Id: I3e013ceeb02da475e0b1e37e715598a2fe048b12
* | | | | | Merge "Refactor hit test object"John Reck2012-01-175-203/+361
|\ \ \ \ \ \
| * | | | | | Refactor hit test objectJohn Reck2012-01-135-203/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9729ca695fda4eefd3aa57d96a872010a3cfba9a
* | | | | | | Merge "Fix GPL build"Glenn Kasten2012-01-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix GPL buildGlenn Kasten2012-01-121-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Idc6090204f7f91a395564e9436d744b6e78d7468
* | | | | | | Merge "Fix use of DBG_SET_LOG in WebViewCore."Mangesh Ghiware2012-01-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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
* | | | | | Merge "Initial NavCache removal"John Reck2012-01-113-157/+224
|\ \ \ \ \ \
| * | | | | | Initial NavCache removalJohn Reck2012-01-113-157/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id34d3be6b11c4ba77b59dd9fb01a9cc050d581f6
* | | | | | | resolved conflicts for merge of 9cb81f0f to masterChris Craik2012-01-111-20/+14
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: I48fe99559230a14d29821d40369ad762d79ba04a
| * | | | | | 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 "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
| * | | | | | Fix crash with composited layers - DO NOT MERGENicolas Roard2012-01-031-1/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Native function to support restore the media player state"Teng-Hui Zhu2012-01-111-0/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Native function to support restore the media player stateTeng-Hui Zhu2012-01-101-0/+19
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | 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 "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
* | | | | Draw GLExtras for each layer.Victoria Lease2012-01-095-20/+51
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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 "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 "Rewrote validZip() with three-digit ZIP prefix."Victoria Lease2012-01-041-74/+178
|\ \ \
| * | | Rewrote validZip() with three-digit ZIP prefix.Victoria Lease2012-01-041-74/+178
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5774164 The previous version of validZip() used a single two-digit ZIP prefix range with two exceptions, per state. This did not accurately reflect postal reality, so I've modified the function to use a proper three-digit ZIP prefix. This should address the ZIP/state mismatches present in the previous implementation, including Montana addresses failing detection. Change-Id: Ia0dada335ff2972e9649308751e60b71799e75ac
* | | Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"Steve Block2012-01-0417-49/+49
|\ \ \
| * | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0317-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I35a9fa5e53a83a9c9a920333a3752dd151fbd3b8
* | | | Fix AppCache when either no path or an invalid path is suppliedSteve Block2012-01-041-10/+26
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only enable AppCache when it's been enabled with a call to WebSetting.setAppCacheEnabled() and if a valid path has been supplied to WebSetting.setAppCachePath(). Requires a corresponding change to frameworks/base: https://android-git.corp.google.com/g/155450 Bug: 5745181 Change-Id: I08d0016e19c436edef725f6ad2513bd369fda7b9
* | | Merge "Enable History API."Ben Murdoch2012-01-031-0/+7
|\ \ \ | |/ / |/| |
| * | Enable History API.Ben Murdoch2011-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3
* | | Fix crash with composited layersNicolas Roard2011-12-161-1/+18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Tap to play/pause for html5 video with UI"Teng-Hui Zhu2011-12-132-7/+3
|\ \