| d9779adc025ab665fde1c9983e7793e96ab56d4e |
|
31-Jul-2012 |
John Reck <jreck@google.com> |
Switch GraphicsOperation to LinearAllocator
Change-Id: I9afb489c55a7acfdc35cfe8655d46ce47923b3df
/external/webkit/Source/WebCore/Android.mk
|
| b9f38925d3cdae56548c3c18300c2964d207ed4e |
|
28-Jul-2012 |
John Reck <jreck@google.com> |
Don't use SkPicture for DrawText recording
Change-Id: I5b6872bc37eefded7decae767fc39f1cef858dac
/external/webkit/Source/WebCore/Android.mk
|
| 77d974918eff4b56050e9f1c3a78becab1244a04 |
|
25-Jul-2012 |
John Reck <jreck@google.com> |
DO NOT MERGE Push everything into an R-Tree
Cherry pick from master
Change-Id: I0ef32777f33104d440459d9d4d3c0d61f75a11a2
/external/webkit/Source/WebCore/Android.mk
|
| e76b13ff11039a3640550fc332dee125b62b4c58 |
|
17-Jul-2012 |
John Reck <jreck@google.com> |
Use a linear allocator for the RTree
Change-Id: I5e04c28a0c65378a26b1b99bcfeed4331591e265
/external/webkit/Source/WebCore/Android.mk
|
| 1cb75f6f5e7b8dbed4119b3a72fc8668bf24531f |
|
14-Jul-2012 |
Nicolas Roard <nicolasroard@google.com> |
New R-Tree implementation
Change-Id: If46f35856279ab2a356cb7f99671fcd15f4ddf37
(cherry picked from commit 19d56fe70a9ea33c3ce2ad4f0b547e35453aeafd)
/external/webkit/Source/WebCore/Android.mk
|
| dbdd2da378a2c3d2baf2524694cb6e25419f8818 |
|
18-May-2012 |
Steve Block <steveblock@google.com> |
Hook up client-based Geolocation mock
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
/external/webkit/Source/WebCore/Android.mk
|
| 5c36c4ca9214cbbe65d12f6b138aef9618d41a99 |
|
17-May-2012 |
Steve Block <steveblock@google.com> |
Switch to client-based Geolocation
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
/external/webkit/Source/WebCore/Android.mk
|
| 0769e328661adb91472349fbfa3a5474a1f7ee0d |
|
17-May-2012 |
Steve Block <steveblock@google.com> |
Move GeolocationServiceBridge to WebKit/android/jni and extract Listener interface
Also modify GeolocationServiceBridge to take a WebViewCore rather than a Frame.
This will simplify the transition to client-based implementation, which will
re-use GeolocationServiceBridge.
No functional change.
Bug: 6511338
Change-Id: I2de9dfed51d785c85b40f362f20189f208adf6ec
/external/webkit/Source/WebCore/Android.mk
|
| e859a34171f2a36877d95197d118d962078f8aa0 |
|
27-Apr-2012 |
John Reck <jreck@google.com> |
Rewrite PictureSet with TURBO!
This changes how partial invals are done by adding a hybrid mode.
What we used to do is generate a SkPicture for the new area. This
SkPicture would possibly be larger than the actual inval, depending
on various merge rules (more SkPictures == slower to draw a tile)
The new code rewrites PictureSet entirely, preserving many of the old rules
but cleans up the code and adds the concept of a "PrerenderedInval". This is
a partial inval that WebKit has rasterized. By having WebKit produce both
a SkPicture and a SkBitmap, we avoid needing to play back the picture and
avoid overdrawing. We take this SkBitmap, and simply update the front
textures with it. This gives us full partial invals through the entire
system without hitting any driver bugs, and with minimal copies. And while
the SkPicture may be larger than the inval, the SkBitmap that is rasterized
is not - it matches the area webkit has said is dirty.
Change-Id: Ieb7ecc9db0d4f679102fda004a43399f9b319ebc
/external/webkit/Source/WebCore/Android.mk
|
| ee56698cfd6b899a9065d40b908cde82bde63657 |
|
13-Apr-2012 |
John Reck <jreck@google.com> |
Fix Gradient & Pattern handling
Bug: 6300357
Switch to GradientSkia (fixes the crash)
Fix GraphicsContextAndroid to delay setting the fill & stroke
shaders until immediately before they are needed, as they can be
updated between when they are set and when they are used, which
SkShader doesn't support.
Change-Id: I85c81ad5764495f45547d2cef08bcf7ed7a885c1
/external/webkit/Source/WebCore/Android.mk
|
| 2e510fd5b5a30f1315c272d44ae3aa4cba355498 |
|
06-Apr-2012 |
Nicolas Roard <nicolasroard@google.com> |
Reorganize platform/graphics/android
Change-Id: Idc67155cfa99784dcd931e705336bfa063ecae46
/external/webkit/Source/WebCore/Android.mk
|
| 64e4b265f84573b97d408f7d3e5aa99a647be057 |
|
03-Apr-2012 |
Nicolas Roard <nicolasroard@google.com> |
Implements a recording GraphicsContext
Change-Id: I41feadb23dce25af321331c459eb159c6141831b
/external/webkit/Source/WebCore/Android.mk
|
| 594c6b805969c2673c84d1d1d1a3556ce376ac7a |
|
04-Apr-2012 |
Chris Craik <ccraik@google.com> |
Rename several classes
BaseTile,BaseTileTexture -> Tile,TileTexture
Used in layers other than the base
LayerGroup -> Surface
Renamed to convey that it is a member of the SurfaceCollection, and that the
layers grouped inside are painted together (if at all)
DualTiledTexture -> SurfaceBacking
Better conveys that this is the raster backing for a surface that can
paint. It may be implemented with two tiled textures for now, but that isn't
as important as its relationship to the surface.
TiledTexture -> TileGrid
Renamed to make it more clear that it was a container of tiles, and to be
less similar to TileTexture
Change-Id: I843f8603a2080cfe5a7313ba1c2eff10620f8aa2
/external/webkit/Source/WebCore/Android.mk
|
| 885e650b12d781be054b31ae6221925a0184dc33 |
|
15-Mar-2012 |
Chris Craik <ccraik@google.com> |
reimplement BaseLayerAndroid as a LayerAndroid subclass
Breaks low res tiling, and expanded rendering bounds.
Change-Id: Iec3ba2adceb6bd95399594d29fd8c0b18c1122ce
/external/webkit/Source/WebCore/Android.mk
|
| 520be0bc8607679d087f20ae2c873b2b4eb02587 |
|
21-Mar-2012 |
John Reck <jreck@google.com> |
Visual Indicator tweaks
Change-Id: I2652ca8d6d3008bb97c2d9ad795240880fd83006
/external/webkit/Source/WebCore/Android.mk
|
| a144ac64329978c258faadf3bc484cf4ae6c5d0d |
|
15-Mar-2012 |
John Reck <jreck@google.com> |
Canvas on a texture
Change-Id: I841b3e021298738c91701068992798a55290a520
/external/webkit/Source/WebCore/Android.mk
|
| b3f4d3af0b06dc168453641e249d0cb9eec9b570 |
|
10-Mar-2012 |
Nicolas Roard <nicolasroard@google.com> |
Introduce a LayerContent interface
Layers can now use a LayerContent object to draw their content.
We currently have two subclasses, one using an SkPicture (currently
used for composited layers), the other using a PictureSet (that we
use for the base layer). First step toward unification...
Change-Id: I5e7fd06a653f02f8721613fd3a39d36fb64a8614
/external/webkit/Source/WebCore/Android.mk
|
| ce76304e955cb279f6f237a84c0ba4fd40a2b2ba |
|
08-Mar-2012 |
Nicolas Roard <nicolasroard@google.com> |
Change the way we apply fixed position to layers
With the latest refactoring we lost the possibility of having a layer
other than LayerAndroid be fixed positioned. This CL remove the
FixedLayerAndroid class (rename it into FixedPositioning) of the
hierarchy, and use delegation to apply fixed position.
Change-Id: Ib291fcaefe6a4431849ccfe2cf458fac6cac58aa
/external/webkit/Source/WebCore/Android.mk
|
| 47b8a953ab1b71113b605fd84489f63938bd7dd7 |
|
07-Mar-2012 |
Nicolas Roard <nicolasroard@google.com> |
Refactor LayerAndroid to add iframe subclasses
Change-Id: Ia3810e83a2d919ff5fa37b8fcd92e6cbbb63d569
/external/webkit/Source/WebCore/Android.mk
|
| 74eee052852e8c1761c48ad2a44a4b394714b8cf |
|
05-Mar-2012 |
Nicolas Roard <nicolasroard@google.com> |
Refactor LayerAndroid and add a FixedLayerAndroid class
Change-Id: Ic94e67678e7f5783bf6690308d0a13ce2202d1f2
/external/webkit/Source/WebCore/Android.mk
|
| d8be9016b7fda67a91b4ee17b3b2e7ba692ee553 |
|
23-Feb-2012 |
Chris Craik <ccraik@google.com> |
layer rendering cleanup/rewrite
* added 'LayerGroup' class
separate the painting/tiled features of a layer (eventually multiple layers)
tiled drawing/preparing/counting details are abstracted out of LayerAndroid
* added 'SurfaceCollection' class
incorporates both the BaseLayerAndroid/LayerAndroid tree, as well as the
vector of tiled LayerGroup
* renamed 'TreeManager' to 'SurfaceManager'
* Removes PaintedSurface
was mostly a thin wrapper around DualTiledTexture
* Combines TilePainter/SurfacePainter
* Simplified ref counting
Change-Id: I92c5c75f48d92e0e28812c56de00102399fc02ee
/external/webkit/Source/WebCore/Android.mk
|
| 39b886463564843ebfd0557dd12b07bf38cb6d83 |
|
27-Feb-2012 |
John Reck <jreck@google.com> |
Delete CursorRing
Bug: 6074032
Change-Id: I74f80da22bebbfac556728bba25bcddc2333629a
/external/webkit/Source/WebCore/Android.mk
|
| 773979f92560dd1aead375c82fd75b584a141e5d |
|
13-Feb-2012 |
John Reck <jreck@google.com> |
Support address detection
Change-Id: I88b6ebfb4c967e954a2420592a58af3ed188226d
/external/webkit/Source/WebCore/Android.mk
|
| ddea613344522ddb1e0b53d2a5bf6785f169d9a7 |
|
16-Dec-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Clean up all the old code paths before TransferQueue"
|
| 62ee9670dd9beeb9a8f21d8737250c081382e2f5 |
|
14-Dec-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Clean up all the old code paths before TransferQueue
TransferQueue is using one GL texture per tile, which is the best in terms of
memory usage.
The old code paths include EGLImage mode and SurfaceTexture per tile mode.
At the same time, all the locks related to EGLImage are deleted too.
There should be no funcationality change here.
By deleting the DoubleBufferTexture, the only thing need to be added into
BaseTileTexture is the TextureInfo, which can be optimized further in the
future.
Change-Id: If27fbca7cb55c73d94fbde3ba02d6208707ad8f0
/external/webkit/Source/WebCore/Android.mk
|
| d0fb9fc8829373b88adf55224fde0e456a9d8665 |
|
15-Dec-2011 |
Chris Craik <ccraik@google.com> |
Don't pass pictures with no content to UI thread
bug:5748182
Adjusted text detection logic to also simply detect content, and moved to a
separate class. No content means a picture is not attached to the layer, and a PaintedSurface isn't allocated to the layer on the UI side.
Most commonly, this avoids allocating textures for the clipping element for an
overscroll div, but only if it has nothing to paint.
Change-Id: I5e57d497780c0532e0f28ac94b7ced3de9718e92
/external/webkit/Source/WebCore/Android.mk
|
| 37da970a4978c0729b6a37c13d0ebc6a17c6d573 |
|
01-Dec-2011 |
Ben Murdoch <benm@google.com> |
Add support for Float64Array.
Cherry pick from WebKit r87197 to add support for
Float64Array. Note that this requires at least V8 3.3.
In particular, this CL means that we will consume less
memory executing Emscripten code.
See http://trac.webkit.org/changeset/87197/
Bug: 5558474
Change-Id: I686d59acfdb56d03496f407d114826f35b4ff2c8
/external/webkit/Source/WebCore/Android.mk
|
| ecc9a729169b40aa92aafc472d01470e9f99aadb |
|
17-Nov-2011 |
Chris Craik <ccraik@google.com> |
resolved conflicts for merge of 4eaaa2a0
Change-Id: I5da59f75c0ea1cdb7818dd3f8dc557fbf1d29885
|
| dfd2fb1ed3c17d0cbb4af895f74704c22130587f |
|
15-Nov-2011 |
Chris Craik <ccraik@google.com> |
synchronous layer updates, and animation deferral during paint
bug:5522081
bug:5239801
bug:5297563
Change-Id: I600f66999e093f720a8ea97ef3e15d3d1d297a8f
/external/webkit/Source/WebCore/Android.mk
|
| 638aaf75a16aa7ad95fd6a129f52f3890274b2e9 |
|
26-Oct-2011 |
Steve Block <steveblock@google.com> |
Fix debug build
- FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld()
FrameLoader::url() was removed in
http://trac.webkit.org/changeset/76872. We should use Document::url()
instead.
- ImageBufferAndroid
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
- Add PluginDebug.cpp to build
- ChromiumIncludes.h
Don't build Chromium code without NDEBUG set
- Frame.cpp
We should not include WebKit files from WebCore. WebViewCore.h introduces
problems due to the change to ChromiumIncludes.h and is not required here.
Bug: 5448972
Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89
/external/webkit/Source/WebCore/Android.mk
|
| 4600714fcda05a5a4355fa7bd1d502b69c8147b6 |
|
13-Oct-2011 |
Nicolas Roard <nicolasroard@google.com> |
am 9bd21466: Merge "Refactor the image sharing code" into ics-mr0
* commit '9bd214662e776fb18e43d1ad32ce274803ec309a':
Refactor the image sharing code
|
| 9651fe9381af8dcc55a6370c3d2a65fcbdab846e |
|
12-Oct-2011 |
Nicolas Roard <nicolasroard@google.com> |
Refactor the image sharing code
We add a separate Images Manager, working
both in GL and software rendering.
bug:5425148
Change-Id: Ib5bc88ad94d49c7f1eb969a716691ac98dc10b77
/external/webkit/Source/WebCore/Android.mk
|
| d7a8fefd0e472b1a70e651ae5b43b94e9a4bd976 |
|
11-Oct-2011 |
claireho <chinglanho@gmail.com> |
Fallback handle if vertical glyphs are missing.
Bug 5094208 : browser VerticalWritingMode support.
Some punctuation has to change its glyph in vertical writing mode.
For example, dash in vertical text is a vertical bar. In
current Android system fonts and fallback fonts, none of them have the
substitute tables for vertical writing mode. We call a conversion
function that converts the punctuation to the Unicode Vertical Form
(0xFE10 - 0xFE19) or to the closest glyphs as alternative when
vertical substitute tables are absent in fonts. Otherwise, we use
Harfbuzz to do the vertical glyph shapping.
Change-Id: If1d31bb72aaaba45ed50bbb75d6246cfa30e3428
/external/webkit/Source/WebCore/Android.mk
|
| d0d7e64a671e46579342231a654f9d0f729e4e73 |
|
10-Oct-2011 |
Chris Craik <ccraik@google.com> |
Merge "Double buffering for layers"
|
| e48d27773894f36d85e5c2e2052ab90d502e1c72 |
|
05-Oct-2011 |
Chris Craik <ccraik@google.com> |
Double buffering for layers
bug:5309934
Defer picture changes and invalidations when:
1) a tiled texture hasn't completed painting
2) the user is scrolling (done in PaintedSurface)
Remaining issues:
Should block updates on zooming
Change-Id: I60ee722e651f96e95a4ac0e819999fc1589037c3
/external/webkit/Source/WebCore/Android.mk
|
| fcb01cd64de0a1d6f8f8c897d16cc2628be53960 |
|
07-Oct-2011 |
John Reck <jreck@google.com> |
Switch find on page to GL
Bug: 5354191
Refactor how extras are drawn in GL
Change-Id: Ifb61c73abecd2d074903a7fb44fe4b82aacc64ac
/external/webkit/Source/WebCore/Android.mk
|
| 8fea66e503c97640d6bdb5b8e5ddcb27324b5866 |
|
01-Sep-2011 |
Nicolas Roard <nicolasroard@google.com> |
Add shared images for layers
bug:5242595 bug:5218173
Change-Id: I37d395e85441671312aac3e236cc8276019aa990
/external/webkit/Source/WebCore/Android.mk
|
| 77e5b594dd717e27b1a8be2b521f738cf5941ae1 |
|
19-Aug-2011 |
Nicolas Roard <nicolasroard@google.com> |
Refactoring of BaseLayerAndroid and GLWebViewState:
- we extract the GL set up GLWebViewState
- we extract the zoom management to a new ZoomManager class
bug:3392331
Change-Id: If42523a7192bab2f8c9d1f00a50721380340230d
/external/webkit/Source/WebCore/Android.mk
|
| 7c554a61cb935660cdc86905d040c781b490150f |
|
01-Aug-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Shared surface texture
Instead of assigning each tile a Surface Texture, now just a normal GL texture.
The content from skia bitmap will first drawn into a queue of Surface Textures,
at draw time, blit them into each tile's GL texture.
Added extra lock to protect the queue operation and Surface Texture operation.
bug:5044597
Change-Id: I25f46228b93a3e99526daf52d8bd0d8d8fcc2879
/external/webkit/Source/WebCore/Android.mk
|
| 3c131605fca8e29a88fdc4923d86bdc3f40adb2b |
|
22-Jun-2011 |
Nicolas Roard <nicolasroard@google.com> |
Implements tiled layers. We remove all the existing code in LayerAndroid
related to the old texture management and introduce two new classes:
- PaintedSurface, used as a placeholder ui-side for the regularly
changing LayerAndroid
- TiledTexture, implementing the tiling of PaintedSurface using a set
of BaseTile
bug:4580444 bug:3392331
Change-Id: I0daa079d2acce49f3baa8c312ea0b0dd457ccd5c
/external/webkit/Source/WebCore/Android.mk
|
| 5dcd286d3e3e60f6a090f775a1fdceb40f578b75 |
|
13-Jul-2011 |
Chris Craik <ccraik@google.com> |
Tile profiling backend
Added tile profiling member (TilesProfiler) to TilesManager to track rendering status of tiles.
Change-Id: Ied828c6ad2a15588965e6641edecb162bd76bc62
/external/webkit/Source/WebCore/Android.mk
|
| beb5d5b7abfe05ecd6dccd281a0885e7a9526286 |
|
30-Jun-2011 |
Chris Craik <ccraik@google.com> |
Merge "Refactoring: Moved 'SkLayer' to 'Layer' class in webkit"
|
| 76152fd25512ebff27cf7977c65ddcf694a6570d |
|
30-Jun-2011 |
Chris Craik <ccraik@google.com> |
Refactoring: Moved 'SkLayer' to 'Layer' class in webkit
Change-Id: Ie1c24e5e402c539e0359810cfdf872178fa083c1
/external/webkit/Source/WebCore/Android.mk
|
| 8dfdf8aa25b250ed3b8c0a443cf1cbaf9bd12c5b |
|
30-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Add initial support for Ganesh renderer.
The GaneshRenderer can now be swapped in for the RasterRenderer in
BaseTile. A following CL will enable this swap at runtime.
Change-Id: Id42040fce2895ab00cccb8f11dfd0489df861655
/external/webkit/Source/WebCore/Android.mk
|
| 232d0b3572d13d9b4fb1211d9d56252a1ede3ed6 |
|
28-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Add BaseRenderer to handle generic rendering tasks.
Change-Id: I5cf0e2da4d4f48be5daf176b5aac8222b9919ba9
/external/webkit/Source/WebCore/Android.mk
|
| ec182c75fb35d955a9115fbaf516f648a48ed0e1 |
|
28-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Cleanup Skia related rendering code for raster rendering.
In the existing code we created a sharedBitmap for BaseTiles and
never used it instead opting for createing bitmaps on the stack to
enable partial invalidation. This CL removes the sharedBitmap concept
and instead creates all bitmaps on the stack.
This means that BackedDoubleBufferedTexture no longer needs to have
a bitmap member, but instead simply takes the bitmap from the caller
and uploads it to the appropriate texture. To make this upload clean
we now pass the bitmap via const references instead of pointers.
Change-Id: Ie218c4b4564e5574ca6e404d4857904ab41a3a5c
/external/webkit/Source/WebCore/Android.mk
|
| fca6a67b130c1f97d366460af412ec6e6de14834 |
|
27-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Refactor and improve the raster rendering for base tiles.
Change-Id: I1dc4622e0ce1602f6dc314f0b510c41adb95a443
/external/webkit/Source/WebCore/Android.mk
|
| 808efddb145d485fdb8202437578f218340124b2 |
|
06-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
/external/webkit/Source/WebCore/Android.mk
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/Android.mk
|
| 3742ac093d35d923c81693096ab6671e9b147700 |
|
08-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78
* changes:
Merge WebKit at r82507: Update ThirdPartyProject.prop
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
Merge WebKit at r82507: Work around a V8 bug
Merge WebKit at r82507: JNIType renamed to JavaType
Merge WebKit at r82507: IconDatabaseClient interface expanded
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
Merge WebKit at r82507: Node::isContentEditable() renamed
Merge WebKit at r82507: Use icon database through IconDatabaseBase
Merge WebKit at r82507: toInputElement() is now a member of Node
Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
Merge WebKit at r82507: StringImpl::computeHash() removed
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
Merge WebKit at r82507: Path::strokeBoundingRect() is now const
Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
Merge WebKit at r82507: Fix conflicts
Merge WebKit at r82507: Fix makefiles
Merge WebKit at r82507: Initial merge by git
|
| bafa44a9b9f47c1487cf18754bbcc6292c372fb6 |
|
07-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Fix makefiles
Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
/external/webkit/Source/WebCore/Android.mk
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/Android.mk
|
| eb40b62c73237c78ff48b131dd9eeb5871c0cc38 |
|
07-Jun-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
refactor the TextureInfo out from SharedTexture, no functional change
Change-Id: I9018a8079da1df2fd55c94aacd4ae96227ad2bd2
/external/webkit/Source/WebCore/Android.mk
|
| 3b523b87218c05c8dd49c191e3d5a7a114907e82 |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
/external/webkit/Source/WebCore/Android.mk
|
| 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 |
|
01-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix conflicts.
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
/external/webkit/Source/WebCore/Android.mk
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/Android.mk
|
| 0bc8a6f1de48da432733e2bd21c5c793b7a0393d |
|
01-Jun-2011 |
Teng-Hui Zhu <ztenghui@google.com> |
Support the screen shot while the video is paused.
Basically, the GL textures generated for the surface texture will be used
for showing the screenshot.
Surface texture will be recycled every time a new video starts.
But GL textures will be recycled either when running out of memory bound,
or when the mediaplayer is deleted.
1. Add the VideoLayerManager as a static instance to manage the info of textures
allocated for the screenshot. The basic info will be added into the manager
while the video is played and prepared. During the draw time, the matirx info
will be updated, too.
2. When there are too many screenshots are created, then we will discard the
oldest one and just show the grey static rectangle to replace the screenshot.
The corresponding framework change is 112501.
Change-Id: Ifea60c96532500f9c93062cc97f7c4ef978046b0
/external/webkit/Source/WebCore/Android.mk
|
| a1f6960b1e7568f18887cd35bb3fe6b3b7f69eae |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Fix Makefiles
PCRE switched for YARR - http://trac.webkit.org/changeset/78042
Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
/external/webkit/Source/WebCore/Android.mk
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/Android.mk
|
| 61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a |
|
17-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Fix Makefiles.
Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
/external/webkit/Source/WebCore/Android.mk
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/Android.mk
|
| d05cd8d73ef0b36cd415af17933fe79f9f8f328d |
|
16-May-2011 |
John Reck <jreck@google.com> |
Basic performance monitor for tiles
Change-Id: Ic67a5093a7c09b870ec34160ae0c999162dddcfc
/external/webkit/Source/WebCore/Android.mk
|
| 4aac085d417cce1ecefcf0553724beede7a9670b |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Fix Makefiles
Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
/external/webkit/Source/WebCore/Android.mk
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/Android.mk
|
| 0fa866435a202d26c06a48475da734e9e98c2879 |
|
09-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Fix Makefiles
See http://trac.webkit.org/changeset/74646
Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
/external/webkit/Source/WebCore/Android.mk
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/Android.mk
|