summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ↵Chris Craik2012-05-301-2/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
| * | | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-301-2/+10
| |\ \ \ | | |/ / | |/| |
| | * | Draw entire layer tree in capturePicture()Chris Craik2012-05-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | | | am c83120b4: am 658c3ec9: Merge "Consider frame offset for text snap ↵George Mount2012-05-302-19/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | rectangle." into jb-dev * commit 'c83120b4d089eed50a8c819256f065457529b862': Consider frame offset for text snap rectangle.
| * | | 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
* | | | am e0c18376: am 6184a1df: Disable copyScrollPosition for iframesJohn Reck2012-05-291-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e0c1837650762f7aaeb5be275fbaa93ded0ecd02': Disable copyScrollPosition for iframes
| * | | 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
* | | Merge "Make sure we don't use GPS when not required"Steve Block2012-05-291-0/+1
|\ \ \
| * | | Make sure we don't use GPS when not requiredSteve Block2012-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that we disable the GPS if a single page makes requests with enableHighAccuracy enabled, followed by requests with enableHighAccuracy disabled. Bug: 6511338 Change-Id: I4d67b84d5eed04822c05f70c2dce47a5a696c2fc
* | | | am 05506155: am 5ac11a7e: Merge "Fix a browser crash related to HTML5 ↵Teng-Hui Zhu2012-05-251-9/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | video." into jb-dev * commit '05506155eaa4e4528ea3d2b05e6953677c6d3205': Fix a browser crash related to HTML5 video.
| * | | 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
* | | | | am a0993e9d: am 9f135757: Merge "Copy scroll position for scrolling layer" ↵John Reck2012-05-251-21/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'a0993e9dadfe2ffaa000aa96d160000c5645fa82': Copy scroll position for scrolling layer
| * | | | 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
* | | | | | am e8a7affb: am 2cb64bfb: Merge "Better support for HTML5 audio loop" into ↵Teng-Hui Zhu2012-05-251-0/+15
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | jb-dev * commit 'e8a7affb3657241b523eb7006333216a62b97d28': Better support for HTML5 audio loop
| * | | | Merge "Better support for HTML5 audio loop" into jb-devTeng-Hui Zhu2012-05-251-0/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Better support for HTML5 audio loopTeng-Hui Zhu2012-05-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5461143 frameworks change: https://android-git.corp.google.com/g/#/c/193751/ Change-Id: I691a8aa7eb2a7fc196358a3ab2929075bd4a8a8b
* | | | | am 06d698b1: am 917ab176: Support content detection metatagsJohn Reck2012-05-246-2/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '06d698b1f053f42cf2a6041fd1298f207d80a01e': Support content detection metatags
| * | | | Support content detection metatagsJohn Reck2012-05-246-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6558360 Change-Id: Idf02946306119755e3284b74f20ea5566f68d8ee
* | | | | am 8959907b: am 91f41286: Support skipping a touch stream due to lack of ↵John Reck2012-05-242-7/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | handlers * commit '8959907b97e269d7183d4817f295234718b41365': Support skipping a touch stream due to lack of handlers
| * | | | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-242-7/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: I8c4cd3bf4c538aff202ed0e3f84982fb112936a1
* | | | am 858defca: am ac4c6f05: Merge "Fix global buffer overlow error reported by ↵Selim Gurun2012-05-241-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ASAN" into jb-dev * commit '858defca5ea993504cb1f32681d2681f6b718a67': Fix global buffer overlow error reported by ASAN
| * | | Merge "Fix global buffer overlow error reported by ASAN" into jb-devSelim Gurun2012-05-241-0/+1
| |\ \ \
| | * | | Fix global buffer overlow error reported by ASANSelim Gurun2012-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6545539 Fix overflow in char* to string conversion. Change-Id: If5f2d1eae8f50ee5b61442e9a71b38c9fc74db46
* | | | | am fe5bfa1b: am 9c52999f: Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fe5bfa1befcb0e865d69d497280db9b16b361da8': Move scrollOffset into Layer class
| * | | | Merge "Move scrollOffset into Layer class" into jb-devChris Craik2012-05-241-1/+1
| |\ \ \ \
| | * | | | Move scrollOffset into Layer classChris Craik2012-05-231-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer can now use the offset to paint, resulting in correct translates for overflow:scroll layers in the Layer::draw() path. bug:6548000 Change-Id: I1dfb88b15491e72e6c3841ce2953e114124e40fd
* | | | | am 284e9fee: am c8d518ba: Merge "properly convert data from utf-16 to utf-8 ↵Victoria Lease2012-05-241-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | in LoadData()" into jb-dev * commit '284e9feef00d472eef6a2eb5757c85df23dd921a': properly convert data from utf-16 to utf-8 in LoadData()
| * | | | Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-devVictoria Lease2012-05-241-3/+3
| |\ \ \ \
| | * | | | properly convert data from utf-16 to utf-8 in LoadData()Victoria Lease2012-05-241-3/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetStringUTFChars() was turning U+1F382 into garbage data: 0xED 0xA0 0xBC 0xED 0xBE 0x82. WTF::String's UChar* constructor converts this codepoint into proper UTF-8: 0xF0 0x9F 0x8E 0x82. Bug: 5961185 Change-Id: Ie8f1ef9b633bda5f7e93570eab9118b35911e93e
* | | | | am 9bada0c1: am 39ba1a3a: Merge "Don\'t send selection info to WebView for ↵George Mount2012-05-241-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | unrendered selections." into jb-dev * commit '9bada0c1014db839ba690474105c2126c11ad317': Don't send selection info to WebView for unrendered selections.
| * | | | Merge "Don't send selection info to WebView for unrendered selections." into ↵George Mount2012-05-241-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-dev
| | * | | | Don't send selection info to WebView for unrendered selections.George Mount2012-05-231-1/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6537569 Change-Id: Iefbb06ad9175f61b79d815c668754538febec4f5
* | | | | am cd6a3bff: am 6f4fd96b: Merge "Don\'t set up background images if 1x1" ↵Nicolas Roard2012-05-231-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'cd6a3bff0abccf9f1c3c3351c6984be2c3124239': Don't set up background images if 1x1
| * | | | Don't set up background images if 1x1Nicolas Roard2012-05-231-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this check in other places. We still need a better solution for the general case. bug:6540356 Change-Id: I3f75c62141d7b6993928927117d972d0ec224b55
* | | | am 697d71c9: am 45aaa37e: Merge "Handle more favicon decoding error cases" ↵John Reck2012-05-224-15/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '697d71c9b19614584faef81da4ff9527aa2a334a': Handle more favicon decoding error cases
| * | | Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
| |\ \ \
| | * | | Handle more favicon decoding error casesJohn Reck2012-05-224-15/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6517530 Switch to having webcoreImageToSkBitmap return a pointer instead as it makes dealing with error cases easier. Also add a check to see if SkImageDecoder::DecodeMemory returned true or false, as if it returns false we may have already allocated pixels (so isNull = false), however it might not have valid data or any config Also aggressively check that we have a valid bitmap with a valid config Change-Id: I2a2e856a389d73cdda319eaeaee5d1279a9e2eb6
| * | | DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
| |/ / | | | | | | | | | | | | | | | | | | Bug 6147580 Framework Change: Idaa538824e611acd64eb5a4ccb7866d3c978a077 Change-Id: I810891decf0bad682e90f29f0f65c6b765b7d6d6
* | | Merge "Remove unused WebViewCore::isPaused() and setIsPaused()"Steve Block2012-05-222-18/+0
|\ \ \
| * | | Remove unused WebViewCore::isPaused() and setIsPaused()Steve Block2012-05-222-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last caller of these methods was removed in I7be5b4224555bc8c3893b75275ac3a997a6677d1. See framework change I9e5c0fd914f53d11e130ffcdc0e749f45dfe4013. Change-Id: Ie645cb657407c34a63e5df6b0ade050f1780a7f0
* | | | am 3d964c36: am fa25b832: Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '3d964c36f6895074686f909bffde814dcd622a73': Null check
| * | Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
| |\ \
| | * | Null checkJohn Reck2012-05-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6525224 Change-Id: Id47ebe8a99388765340f7628b6398644dd7d852c
* | | | Remove the hacks used to suspend and resume the non-client-based Geolocation ↵Steve Block2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation These forks to WebCore code are not required with the client-based implementation, as we can suspend and resume the client directly. Bug: 6511338 Change-Id: I7be5b4224555bc8c3893b75275ac3a997a6677d1
* | | | Hook up client-based Geolocation mockSteve Block2012-05-223-30/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simply involves updating GeolocationMock, which is called by DRT from Java, to call the GeolocationClientMock via GeolocationManager, rather than the old GeolocationServiceMock. Note that GeolocationClientMock is tied to a specific page, whereas GeolocationServiceMock had static methods, so we need to pass the WebViewCore from Java. We can now safely exclude the non-client-based files from the build. We pass all Geolocation LayoutTests, except for permission-denied-already-[error|success].html, which are flaky due to https://bugs.webkit.org/show_bug.cgi?id=87033. See corresponding framework change I6d88d5dce5c2148812b191a5b452718bf0854aeb. Bug: 6511338 Change-Id: Ib74a3c05991593e75c3138415d4ac0bf0c9aefa9
* | | | Always call back to new Geolocation requestsSteve Block2012-05-222-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure we always call back to new Geolocation requests, even when other requests are ongoing. Note that it requires an Android-specific change to WebCore to fix https://bugs.webkit.org/show_bug.cgi?id=87030. Bug: 6511338 Change-Id: If46d2ef0eb8e81925ae51ed2e8f2d16a9fa6c997
* | | | Switch to client-based GeolocationSteve Block2012-05-2214-88/+638
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation for this switch is that it is required to enable PREEMPT_GEOLOCATION_PERMISSION. See b/4500947. The switch involves changing lots of Android's WebKit plumbing to use a new GeolocationClientAndroid in WebKit (called from WebCore::GeolocationController), rather than the existing GeolocationServiceAndroid in WebCore/platform (called from WebCore::Geolocation). This is complicated by the need to support mocking for LayoutTests. The pattern used is very similar to that used for DeviceOrientation and DeviceMotion. This patch ... - Enables CLIENT_BASED_GEOLOCATION - Leaves PREEMPT_GEOLOCATION_PERMISSION disabled for now - Removes GeolocationServiceAndroid - Adds a new GeolocationClientAndroid - Just a proxy to real client - Adds a new GeolocationManager - Manages switching between the real and mock clients - Provides the appropriate client to GeolocationClientAndroid - Plumbs to the real client calls for permissions and for suspending/resuming - Adds a new GeolocationClientImpl - The real client - Based heavily on GeolocationServiceAndroid - Delegates to GeolocationServiceBridge, as GeolocationServiceAndroid did - Calls back directly to GeolocationController - Owns the existing GeolocationPermissions - Updates WebViewCore to call the GeolocationManager for permissions and for suspending/resuming - Removes superfluous ChromeClient methods for permissions Note that support for mocking will be added in a later change. See bug for details. Bug: 6511338 Change-Id: I4cdbf55846e76b37c161834b83135b4dc48dbcdc