summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used the surface's first layer's area, which is often incorrect in the case of significant layer merging. bug:6545187 Change-Id: Ied3e5e3cd894b145ed905f8ba83649b3c4f3b1dd
* | | | | | | | am f942c7b1: am 21ed283c: Merge "Add tracing to interesting/potentially ↵Chris Craik2012-05-233-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | costly functions" into jb-dev * commit 'f942c7b1e00c598672ed1298d08f543eb17b702e': Add tracing to interesting/potentially costly functions
| * | | | | | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6530473 bug:6344165 Change-Id: I40b190036af8c021134d5ac450e3217098ba2296
* | | | | | | am 5557efbd: am 17f16d58: Merge "Clean up the transferQueue code and add ↵Teng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more detailed GL log" into jb-dev * commit '5557efbdd0cc4e7c6c4a849ae590699a68c1e2d7': Clean up the transferQueue code and add more detailed GL log
| * | | | | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove one unnecessary parameter in blitTileFromQueue. Remove syncKHR related code in TransferQueue since that is supported by SurfaceTexture. bug:6516534 Change-Id: Iaf1f46a0f459ad8973c7465a9b8550f760115384
* | | | | | am 1d1eaec5: am a6645da2: Merge "Correctly handle the EGL context ↵Teng-Hui Zhu2012-05-232-24/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recreation." into jb-dev * commit '1d1eaec558a4a4aa8a054c5bb36c9a0e5f715598': Correctly handle the EGL context recreation.
| * | | | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6516534 Change-Id: Iaf62359803d65d3a9acb88aa224a1a5c42f8aa4c
* | | | | | am 344434ac: am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '344434ac35a7b6406e794e619f8a8a1f6a6805fb': Fix crash
| * | | | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix crashNicolas Roard2012-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6537803 Change-Id: Ie0bb6e64644fd82c0ed6cf92c592c434f67fdc0d
* | | | | | am 311b8af6: am 55d60259: Merge "Don\'t use an ImageBuffer for ↵John Reck2012-05-222-1/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scratchContext()" into jb-dev * commit '311b8af66f874fb9dfa1680c6910b9653ff41ea1': Don't use an ImageBuffer for scratchContext()
| * | | | | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6509450 Change-Id: I6d952b92062e96772663824839b0229062c3a524
* | | | | | am ee7dbc2a: am 56ec1c56: Merge "We need to clear the items even when seeing ↵Teng-Hui Zhu2012-05-221-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete tiles" into jb-dev * commit 'ee7dbc2aac5123cc15590218bbaf182a8abeb3e3': We need to clear the items even when seeing obsolete tiles
| * | | | | Merge "We need to clear the items even when seeing obsolete tiles" into jb-devTeng-Hui Zhu2012-05-221-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | We need to clear the items even when seeing obsolete tilesTeng-Hui Zhu2012-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6531360 Change-Id: Ia23ddeb56d384c4e3904cabf787bbe72be4a6f08
* | | | | 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
* | | | | Merge "Use preemptive permissions policy for Geolocation"Steve Block2012-05-221-5/+0
|\ \ \ \ \
| * | | | | Use preemptive permissions policy for GeolocationSteve Block2012-05-221-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we always check for permission before starting the location acquisition process. We pass all Geolocation LayoutTests. Bug: 4500947 Change-Id: Ia963874cecbf79ce2cc99c5f848682d1cc8aa6aa
* | | | | 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-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
| * | | | 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
| * | | | | 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
| * | | | | 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
| * | | | 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
| * | | | | 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
| * | | | Fix memory leak and repaint issues with fixed background elementsNicolas Roard2012-05-185-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6522485 bug:6486951 Change-Id: Ia707efed9311e4352eed3ab005ec7ca93b8444e4
* | | | | 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, ..."