summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Remove the hacks used to suspend and resume the non-client-based Geolocation ↵Steve Block2012-05-226-37/+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-224-32/+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-223-3/+32
| | | | | | | | | 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-2218-373/+645
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* am f282a4d1: am 37289e42: Merge "Disable transform fudging for merged ↵Chris Craik2012-05-212-1/+8
|\ | | | | | | | | | | | | surfaces" into jb-dev * commit 'f282a4d1efb427883fb318127e175a95c6fbac64': Disable transform fudging for merged surfaces
| * am 37289e42: Merge "Disable transform fudging for merged surfaces" into jb-devChris Craik2012-05-212-1/+8
| |\ | | | | | | | | | | | | * commit '37289e42b769cb9f394964ad318791723bfe50af': Disable transform fudging for merged surfaces
| | * Merge "Disable transform fudging for merged surfaces" into jb-devChris Craik2012-05-212-1/+8
| | |\
| | | * Disable transform fudging for merged surfacesChris Craik2012-05-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Draw transforms are used at painting time for merged surfaces, so they shouldn't be manipulated in the draw path. The fudging isn't necessary for these surfaces in the first place, as merged surfaces are always aligned to pixel coordinates. bug:6156523 Change-Id: I3d954869188008f1a9e35915df893d75b49be6a2
* | | | am 13c0becf: am db197e8d: Merge "Real isn\'t real according to the USPS, but ↵John Reck2012-05-211-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | add it anyway" into jb-dev * commit '13c0becfffb869bb9b66c5e8e44a0792b6ea97c2': Real isn't real according to the USPS, but add it anyway
| * | | am db197e8d: Merge "Real isn\'t real according to the USPS, but add it ↵John Reck2012-05-211-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | anyway" into jb-dev * commit 'db197e8d4baa349cce657ed13e0fef9d117b06ff': Real isn't real according to the USPS, but add it anyway
| | * | Merge "Real isn't real according to the USPS, but add it anyway" into jb-devJohn Reck2012-05-211-1/+1
| | |\ \
| | | * | Real isn't real according to the USPS, but add it anywayJohn Reck2012-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6519914 Change-Id: I437ff480a0fa6ba6aed6e207ac021f666c9843c6
* | | | | am 8a1bb3c8: (-s ours) am 8084d1f1: Merge "Turn off autohinting at HDPI. do ↵Billy Hewlett2012-05-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | not merge" into jb-dev * commit '8a1bb3c8b059f4e7bc3b677e57fee17548de650e': Turn off autohinting at HDPI. do not merge
| * | | | am 8084d1f1: Merge "Turn off autohinting at HDPI. do not merge" into jb-devBilly Hewlett2012-05-211-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8084d1f1dd41063c37a77b12f382ee2b08ded30b': Turn off autohinting at HDPI. do not merge
| | * | | Merge "Turn off autohinting at HDPI. do not merge" into jb-devBilly Hewlett2012-05-211-0/+4
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Turn off autohinting at HDPI. do not mergeBilly Hewlett2012-05-211-0/+4
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of CL: 752753e2caf24f28dac51731ee1f1443cf511410 Bug: 6478362 Change-Id: I9734658a509010035eb3081be8affb609863d46c
* | | | am 655f75fe: am 2c52cc31: Merge "Switch to a 4ms/1s timer" into jb-devJohn Reck2012-05-213-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '655f75feeee4c396740a8e768888c7c8f0602cb8': Switch to a 4ms/1s timer
| * | | am 2c52cc31: Merge "Switch to a 4ms/1s timer" into jb-devJohn Reck2012-05-213-4/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2c52cc3176d97bc3f0bb59f8684c06c94201ef98': Switch to a 4ms/1s timer
| | * | Merge "Switch to a 4ms/1s timer" into jb-devJohn Reck2012-05-213-4/+10
| | |\ \
| | | * | Switch to a 4ms/1s timerJohn Reck2012-05-183-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6523124 Bug: 6523033 Use a 4ms timer for foreground tabs, and a 1s timer for background tabs Change-Id: Iea061d63adf82f6e17dd2d47d382fcdfc588b7d3
* | | | | am 0e518116: am 261f8950: Add checks for null base layer contentChris Craik2012-05-211-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0e518116e66e544a899674ed1a5039b2c7e04f05': Add checks for null base layer content
| * | | | am 261f8950: Add checks for null base layer contentChris Craik2012-05-211-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '261f89503d6606bb4896a4effe0ab4d5b4e01d8a': Add checks for null base layer content
| | * | | Add checks for null base layer contentChris Craik2012-05-211-2/+2
| | | |/ | | |/| | | | | | | | | | | | | bug:6519982 Change-Id: I1ef0eda2b94090cc894441c1620ae85e7fd86d22
* | | | am 0fec4094: am 6baa213e: Fix memory leak and repaint issues with fixed ↵Nicolas Roard2012-05-215-17/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | background elements * commit '0fec40942c5e424610b19929bbcd0a1dd4f53246': Fix memory leak and repaint issues with fixed background elements
| * | | am 6baa213e: Fix memory leak and repaint issues with fixed background elementsNicolas Roard2012-05-185-17/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6baa213e1806af132b1f0b1170343c5ac2bf75d3': Fix memory leak and repaint issues with fixed background elements
| | * | Fix memory leak and repaint issues with fixed background elementsNicolas Roard2012-05-185-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | bug:6522485 bug:6486951 Change-Id: Ia707efed9311e4352eed3ab005ec7ca93b8444e4
* | | | am 82ea97e5: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '82ea97e51eafcadb404f438f18f46ff21c7b34db': Revert "Allow more layers to be merged."
| | | |
| | \ \
| *-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I17e9be4976cb2422cc53d4ef185dbe8069789658
| | | * \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | | |\ \ \ | | |/ / / /
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | |\ \ \ \
| | | * | | | Revert "Allow more layers to be merged."Chris Craik2012-05-164-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing content to go missing. bug:6504906 This reverts commit 0b072353e2ad89087c944dfb4acb1eff87bbac49
* | | | | | | am 80e066f5: am 8156b667: Merge "Revert part of "Fix iframe, ..."" into jb-devMangesh Ghiware2012-05-215-1/+87
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '80e066f593d481ee02fc9cde720967532015493e': Revert part of "Fix iframe, ..."
| * | | | | | am 8156b667: Merge "Revert part of "Fix iframe, ..."" into jb-devMangesh Ghiware2012-05-185-1/+87
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '8156b6674402608e0304803380ef0e5e2845588d': Revert part of "Fix iframe, ..."
| | * | | | | Merge "Revert part of "Fix iframe, ..."" into jb-devMangesh Ghiware2012-05-185-1/+87
| | |\ \ \ \ \
| | | * | | | | Revert part of "Fix iframe, ..."Mangesh Ghiware2012-05-185-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DOMWindow innerWidth and innerHeight to report correct values even after an orientation change. Uses platform-specific widget. This reverts part of commit I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733. Bug: 6479900 Change-Id: Ic5c8785e35b14d6723eee4f4dfe1b0a3e1ec284a
* | | | | | | | am 6718ce8a: am 48605bf1: Remove paint tile operations for stale paintersChris Craik2012-05-217-2/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6718ce8aa305996bd53ef3836f5ed057b5180cd8': Remove paint tile operations for stale painters
| * | | | | | | am 48605bf1: Remove paint tile operations for stale paintersChris Craik2012-05-187-2/+46
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '48605bf1f6bc77a1f037f23285baf7706f45d198': Remove paint tile operations for stale painters
| | * | | | | | Remove paint tile operations for stale paintersChris Craik2012-05-187-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6516612 also adds ClassTracker to several classes Change-Id: I9a503084240d4935fba300a3256d266a2982dcc0
* | | | | | | | am e6dd6940: am d4239885: Merge "Cherrypick WebKit r94543." into jb-devVictoria Lease2012-05-218-5/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6dd6940d3e008de2da31277f30caacea20375ca': Cherrypick WebKit r94543.
| * | | | | | | am d4239885: Merge "Cherrypick WebKit r94543." into jb-devVictoria Lease2012-05-188-5/+52
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd423988553ea721896b4ac1d3720ed04332ebbb3': Cherrypick WebKit r94543.
| | * | | | | | Merge "Cherrypick WebKit r94543." into jb-devVictoria Lease2012-05-188-5/+52
| | |\ \ \ \ \ \
| | | * | | | | | Cherrypick WebKit r94543.Victoria Lease2012-05-188-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/94543 isBeforeOrAfterContent() was already pulled in from r94543 as a part of I02da7a9f891a6eec394398529f64b0992cbfce70, but we needed the rest of the patch to address our ruby text alignment issues. Bug: 6105670 Change-Id: Iad4d6308ab053488abd118eee83058cfc81e22e8
* | | | | | | | | am 035ccee8: am 17a19ec1: Merge "Clean up some redundant code" into jb-devTeng-Hui Zhu2012-05-212-6/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '035ccee8d36c4f500bd45d7af6c45e51826c9616': Clean up some redundant code
| * | | | | | | | am 17a19ec1: Merge "Clean up some redundant code" into jb-devTeng-Hui Zhu2012-05-182-6/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17a19ec12d412e1fc4b899e2aea97852bdd00e9a': Clean up some redundant code
| | * | | | | | | Merge "Clean up some redundant code" into jb-devTeng-Hui Zhu2012-05-182-6/+2
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Clean up some redundant codeTeng-Hui Zhu2012-05-172-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6457191 Change-Id: Ie3ec0315151119b4428fdd97451084894f63db13
* | | | | | | | | am fd569800: am 1e59a334: Make sure CanvasLayer isn\'t merged and is ↵John Reck2012-05-213-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized correctly * commit 'fd5698006bcb9182415182cc825a4b4949167d05': Make sure CanvasLayer isn't merged and is initialized correctly
| * | | | | | | | am 1e59a334: Make sure CanvasLayer isn\'t merged and is initialized correctlyJohn Reck2012-05-173-1/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e59a334a1203c7be3fff2f9dbf94fee5b879d20': Make sure CanvasLayer isn't merged and is initialized correctly
| | * | | | | | | Make sure CanvasLayer isn't merged and is initialized correctlyJohn Reck2012-05-173-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6516775 Change-Id: Ifecddec18d369ba701668be85d4032918fc8d4fa