OSDN Git Service
Chris Craik [Mon, 1 Aug 2011 20:44:44 +0000 (13:44 -0700)]
Support registering page swap callback, content inval
bug:
5062896
Depends on the following frameworks/base change:
https://android-git.corp.google.com/g/#change,124879
a WebView may now register a page swap callback and content invalidate to
benchmark tile rendering performance
Change-Id: I97f6ed05cff12b11266a472163aab1f3b3ddc87e
Teng-Hui Zhu [Mon, 1 Aug 2011 17:05:13 +0000 (10:05 -0700)]
Merge "Unify the the tile size for base tiles and layers"
Teng-Hui Zhu [Fri, 29 Jul 2011 20:52:06 +0000 (13:52 -0700)]
Unify the the tile size for base tiles and layers
In order to use the shared Surface Texture to support both base tiles and
layers, the tile size has to be the same.
Separate this change out to catch any potential perf regression or boost.
bug:
5044597
Change-Id: Ib296def7595ea605fa96745f333ec8ef6d199293
Chris Craik [Fri, 29 Jul 2011 20:20:09 +0000 (13:20 -0700)]
Merge "fixed race condition in tile profiling"
Derek Sollenberger [Fri, 29 Jul 2011 19:34:24 +0000 (12:34 -0700)]
Merge "Add features to support Ganesh in the Android browser"
Chris Craik [Fri, 29 Jul 2011 19:33:09 +0000 (12:33 -0700)]
fixed race condition in tile profiling
bug:
5062896
If tile profiling was started, and experienced an inval/tile update it wouldn't
have a place to log it. Added check to make sure it didn't try to store it in
the log vector anyway.
Change-Id: I18f199740a60a86439da141502ea355340bfa8cf
Nicolas Roard [Fri, 29 Jul 2011 18:30:01 +0000 (11:30 -0700)]
Merge "Reduce the number of layers - overflow elements triggered all layers before them to be composited; this is not needed at all... - fixed elements will trigger layers after them to be composited, but we don't need to composite all of them -- the one fully contained into previous composited layers don't need to..."
Nicolas Roard [Wed, 20 Jul 2011 19:58:10 +0000 (12:58 -0700)]
Reduce the number of layers
- overflow elements triggered all layers before them to be composited;
this is not needed at all...
- fixed elements will trigger layers after them to be composited, but
we don't need to composite all of them -- the one fully contained
into previous composited layers don't need to...
bug:
5069090
Change-Id: I65f789f490b837a16096b4cb186c45ade1605b41
Kristian Monsen [Fri, 29 Jul 2011 10:37:42 +0000 (03:37 -0700)]
Merge changes I48e19e8a,I1ee0fbf6,I1c81bc8c
* changes:
Part of fix for
5065047: build libchromium as a shared lib
Preparation for fixing bug
5065047: build libchromium as a shared lib
Preparation for fixing bug
5065047: build libchromium as a shared lib
Chris Craik [Fri, 29 Jul 2011 00:23:56 +0000 (17:23 -0700)]
Merge "added pageswap callback from drawGL to WebView"
Chris Craik [Thu, 28 Jul 2011 18:32:08 +0000 (11:32 -0700)]
added pageswap callback from drawGL to WebView
bug:
5008210
When setting a new base layer, WebView can signal that it wants to have it's
pageSwapCallback triggered. This is only done upon request, currently whenever
the WebTextView is being displayed so that it can be repositioned upon pageswap.
Depends on the following frameworks/base change:
https://android-git.corp.google.com/g/#change,124607
Change-Id: Id99c2d5a15cdb4317802a92cedae16a9e0aebc8d
Derek Sollenberger [Fri, 1 Jul 2011 13:30:26 +0000 (09:30 -0400)]
Add features to support Ganesh in the Android browser
1) Added a runtime switch between Raster and Ganesh
2) Added support for using SurfaceTextures with Ganesh
bug:
5013645
Change-Id: I2efebf1bc9befb0c7f6f66109d80818f9d0775b3
Ben Murdoch [Thu, 28 Jul 2011 19:21:09 +0000 (20:21 +0100)]
Disable Crankshaft at runtime for performace testing.
Bug:
5052287
Change-Id: Ic2b192a5f22c7bc91b7bc587904452e440cbe505
Kristian Monsen [Mon, 25 Jul 2011 09:34:05 +0000 (10:34 +0100)]
Part of fix for
5065047: build libchromium as a shared lib
Webkit patch needed, simply declaring that chromium_net is a
shared library
Change-Id: I48e19e8aca929258ddde70f1772073fa9e0097a1
Kristian Monsen [Thu, 28 Jul 2011 10:33:37 +0000 (11:33 +0100)]
Preparation for fixing bug
5065047: build libchromium as a shared lib
Use FormField from chromium, it is already populated it FormManagerAndroid,
so there is no need for the Android implementation anymore.
Change-Id: I1ee0fbf6895bd64b2fd1d9a6fbd2f0a93e578831
Russell Brenner [Mon, 25 Jul 2011 23:25:38 +0000 (16:25 -0700)]
Fix for Devanagari diacritical marks
It appears that offsetX and advance were at odds with each other.
Eliminating offsetX causes the diacritical marks to be positioned
correctly.
Bug:
4309954
Change-Id: I51fbdd4523ba7de1a2d981b971fdd4f1d42b979c
Chris Craik [Wed, 27 Jul 2011 01:10:16 +0000 (18:10 -0700)]
Merge "Draw WebTextView inset in the textfield/area's border"
Ben Murdoch [Tue, 26 Jul 2011 11:43:01 +0000 (12:43 +0100)]
Fix typo in mobile site detection for automatic viewport.
Bug:
5073443
Change-Id: I433aae6c4cea5677ac4c04d34d50b903a48ebbe6
Shimeng (Simon) Wang [Mon, 25 Jul 2011 23:01:54 +0000 (16:01 -0700)]
Refactor the overflow scroll fix.
Hope this is more understandable.
issue:
4203823
Change-Id: Ib1d95f6b250baf4b94f706e090a9f087aa9b7ed8
Chris Craik [Mon, 25 Jul 2011 21:55:39 +0000 (14:55 -0700)]
Draw WebTextView inset in the textfield/area's border
bug:
5008210
Also reduced some duplication of code for returning java rects.
Change-Id: I614e0cdaea7a30dc0b647b8290a8d66464c0b87c
Shimeng (Simon) Wang [Mon, 25 Jul 2011 21:45:08 +0000 (14:45 -0700)]
Disable customized overflow scroll for positioned renderblock.
This fixes maps.google.com dropdown list scrolling issue.
Tested on developer.android.com, slate.com, lemonde.fr; the existing
overflow scrolling are working as before this change.
issue:
4203823
Change-Id: I11cebbfd8bb3dd060bbee1b29ec96627fcbf1a72
Kristian Monsen [Mon, 25 Jul 2011 09:31:42 +0000 (10:31 +0100)]
Preparation for fixing bug
5065047: build libchromium as a shared lib
The chrome stack used to just declare the needed jni functions from
webkit and use them as they were static linked. This is not possible
when built as a shared library.
Change-Id: I1c81bc8c8e840dfda49e3941dc5a74d129030f43
Chris Craik [Thu, 21 Jul 2011 22:59:20 +0000 (15:59 -0700)]
Merge "New tile logging JNI interface"
Chris Craik [Wed, 20 Jul 2011 23:12:29 +0000 (16:12 -0700)]
New tile logging JNI interface
bug:
5062896
Added more functionality to tile logging and querying (explicit location and
size), invalidation region logging, as well as string-based JNI query method
which should stabilize the JNI interface in the future.
Change-Id: I937d4227abf0d0f18124c484438fd13a62439fb6
Shimeng (Simon) Wang [Thu, 21 Jul 2011 20:42:49 +0000 (13:42 -0700)]
Merge "Limit RTL text wrapping when having floating element."
Shimeng (Simon) Wang [Thu, 21 Jul 2011 18:56:50 +0000 (11:56 -0700)]
Limit RTL text wrapping when having floating element.
issue:
5047703
Change-Id: Ie7d9bb54649afb4d025d4ec02bcc42b52b4049d1
Shimeng (Simon) Wang [Thu, 21 Jul 2011 16:53:14 +0000 (09:53 -0700)]
Merge "Safely convert punycode IDN to Unicode for display."
Shimeng (Simon) Wang [Wed, 20 Jul 2011 23:36:45 +0000 (16:36 -0700)]
Safely convert punycode IDN to Unicode for display.
Use chromium's net::IDNToUnicode to accomplish this, which adopts
safe measures for converting.
issue:
4384726
Change-Id: If265a849ff0e9d6782705fc1639391bab9e6bcab
Nicolas Roard [Wed, 20 Jul 2011 23:11:43 +0000 (16:11 -0700)]
Merge "Add some debugging functions to LayerAndroid"
Nicolas Roard [Wed, 20 Jul 2011 19:55:58 +0000 (12:55 -0700)]
Add some debugging functions to LayerAndroid
Change-Id: I03922d9788d340ab208677b272470312c92a80ee
Steve Block [Wed, 20 Jul 2011 18:27:06 +0000 (11:27 -0700)]
Merge "Update JavaMethodJobject with upstreamed version of fix"
Steve Block [Wed, 20 Jul 2011 14:46:25 +0000 (15:46 +0100)]
Update JavaMethodJobject with upstreamed version of fix
See https://bugs.webkit.org/show_bug.cgi?id=62389
Bug:
4585284
Change-Id: Ib99f9ff5d3b552fb7a40b00324f3e96ffc7e3e23
Steve Block [Tue, 19 Jul 2011 15:57:32 +0000 (16:57 +0100)]
Cherry-pick WebKit change 91260 to fix JNI string null-termination
See http://trac.webkit.org/changeset/91260
Bug:
4727789
Change-Id: I2f01bde12463a3c19659340cdb85b69eaecbd0f7
John Reck [Fri, 15 Jul 2011 17:51:44 +0000 (10:51 -0700)]
Implement an invert screen mode
Set through the new property interface
Change-Id: I62e3986a5a0d5a41faf0eeee6cd1c0f7186e1cf5
Nicolas Roard [Fri, 15 Jul 2011 16:36:55 +0000 (09:36 -0700)]
Merge "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"
Nicolas Roard [Tue, 21 Jun 2011 23:21:55 +0000 (16:21 -0700)]
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
Shimeng (Simon) Wang [Thu, 14 Jul 2011 22:13:53 +0000 (15:13 -0700)]
Add android specific virtual function to GraphicsLayerClient.
This lets the GraphicsLayerClient instance decides whether it has
owning RenderLayer, instead of using static_cast.
This makes overflow'ed iframe scrollable again.
This change also reverts Tenghui's CL:
https://android-git.corp.google.com/g/#change,115508
Tested on scrollable iframe and inline video.
issue:
4902019
Change-Id: I252f5432b0750c5cac0a4404663e1730ef006cfc
Chris Craik [Wed, 13 Jul 2011 19:58:41 +0000 (12:58 -0700)]
Tile profiling backend
Added tile profiling member (TilesProfiler) to TilesManager to track rendering status of tiles.
Change-Id: Ied828c6ad2a15588965e6641edecb162bd76bc62
Ben Murdoch [Wed, 13 Jul 2011 09:19:44 +0000 (10:19 +0100)]
Merge WebKit at branches/chromium/742 r89068: Update ThirdPartyProject.prop
Change-Id: Iaed175c2018323e12e78dcdf6fc2cf424ed4ec54
Ben Murdoch [Wed, 13 Jul 2011 09:14:36 +0000 (10:14 +0100)]
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
Jeff Brown [Tue, 12 Jul 2011 19:14:48 +0000 (12:14 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Ben Murdoch [Tue, 12 Jul 2011 15:50:53 +0000 (08:50 -0700)]
Merge "Merge Chromium at r12.0.742.93: Update Autofill files in WebKit."
Ben Murdoch [Mon, 11 Jul 2011 13:29:09 +0000 (14:29 +0100)]
Merge Chromium at r12.0.742.93: Update Autofill files in WebKit.
Apply diffs to the forked copies of Chromium files we keep in
external/webkit.
See:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/renderer/autofill/form_manager.cc?r1=67599&r2=82248
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/renderer/autofill/form_manager.h?r1=67599&r2=82248
http://src.chromium.org/viewvc/chrome/branches/742/src/webkit/glue/form_field.cc?r1=67599&r2=82248
http://src.chromium.org/viewvc/chrome/branches/742/src/webkit/glue/form_field.h?r1=67599&r2=82248
Change-Id: If62167848d86293cb833c593afd2c0c958bafbef
Steve Block [Mon, 11 Jul 2011 09:39:10 +0000 (10:39 +0100)]
notImplemented() should always log to logcat
- Update Android's version of notImplemented() to match that on other
platforms and only log once for each method.
- Remove lowPriority_notImplemented(), as this was added way back in
https://mondrian.corp.google.com/changelist/16159-p9 and I'm pretty
sure the distinction between that and notImplemented() has long
since been lost.
- Move verifiedOk() to FrameLoaderClientAndroid.cpp as this is the
only place it is used.
Bug:
5008643
Change-Id: I6552a2a736873b4dfb0933e55af3ab862b60f87c
Jeff Brown [Tue, 12 Jul 2011 05:12:13 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: Iec42857a1f01da52a1f9e968ffa0e791404063b4
Teng-Hui Zhu [Mon, 11 Jul 2011 23:19:45 +0000 (16:19 -0700)]
Merge "Clear up the bitmap with white color at initial time"
Teng-Hui Zhu [Mon, 11 Jul 2011 21:32:32 +0000 (14:32 -0700)]
Clear up the bitmap with white color at initial time
bug:
4995281
Change-Id: Iee2d508c234d3e1cecb367b0108fd7215730173c
Shimeng (Simon) Wang [Sat, 9 Jul 2011 00:43:19 +0000 (17:43 -0700)]
Merge "Revert "Factor the scale into the actual screen space calculation.""
Shimeng (Simon) Wang [Fri, 8 Jul 2011 23:54:05 +0000 (16:54 -0700)]
Revert "Factor the scale into the actual screen space calculation."
This reverts commit
706c2b4c3089f2832c8172c0581e3df110bf534c.
Teng-Hui Zhu [Fri, 8 Jul 2011 21:32:32 +0000 (14:32 -0700)]
Merge "Add the matrix handle to the shaders."
Kristian Monsen [Fri, 8 Jul 2011 20:57:28 +0000 (13:57 -0700)]
Merge "Possible fix for bug
3335863: 3-second delay before Incognito state is cleared"
Kristian Monsen [Fri, 8 Jul 2011 18:31:38 +0000 (11:31 -0700)]
Merge changes I02f589b6,Ie54a0054,I80966819,Ib8898076,Ie3d53bc3
* changes:
Merge Chromium at r12.0.742.93: Direct access in FormField
Merge Chromium at r12.0.742.93: Autofill fixes
Merge Chromium at r12.0.742.93: Snapstart error code removed
Merge Chromium at r12.0.742.93: CookiePolicy update
Merge Chromium at r12.0.742.93: Updating include paths
Teng-Hui Zhu [Fri, 8 Jul 2011 17:57:14 +0000 (10:57 -0700)]
Add the matrix handle to the shaders.
We are just getting lucky that the handle is the same for now.
Change-Id: I8d897148dfaa29acbb2e23fd8894fcfea7f00215
Steve Block [Fri, 8 Jul 2011 16:22:21 +0000 (17:22 +0100)]
When restoring the global reference in the WeakJavaInstance destructor, always do so from our weak global reference
This avoid using a stale local reference in the case that calls to
begin() and end() are unbalanced.
Bug:
5006434
Change-Id: I3d1bb4ecfe11e9b54fb2a48b6ab9663ea753be54
Steve Block [Fri, 8 Jul 2011 11:29:33 +0000 (04:29 -0700)]
Merge "Delete a JNI local ref in WebViewCore::openFileChooser()"
Steve Block [Thu, 7 Jul 2011 17:48:21 +0000 (18:48 +0100)]
Delete a JNI local ref in WebViewCore::openFileChooser()
Change-Id: I3a488125d86a4f8cc63691ae7035cad0eadaf514
Huahui Wu [Thu, 7 Jul 2011 21:27:13 +0000 (14:27 -0700)]
Revert "b/
3302378 Passes touch pressures, sizes and timestamps to Webkit"
This reverts commit
7b306176de5c64ae37dbb93e9324dd6636c5b564.
It introduced a null pointer crash for pinch-and-zoom.
Change-Id: I7e94eadca25d076950073e10401c4438f3838f39
Kristian Monsen [Thu, 7 Jul 2011 21:08:31 +0000 (22:08 +0100)]
Merge Chromium at r12.0.742.93: Direct access in FormField
FormField changed to a struct with public members instead of
a class with setters and getters. CL:
http://codereview.chromium.org/
6625087
Change-Id: I02f589b671147c1ff09661b032c979c85e15a264
Huahui Wu [Thu, 7 Jul 2011 18:05:05 +0000 (11:05 -0700)]
Merge "b/
3302378 Passes touch pressures, sizes and timestamps to Webkit"
Kristian Monsen [Thu, 7 Jul 2011 15:10:44 +0000 (16:10 +0100)]
Merge Chromium at r12.0.742.93: Autofill fixes
AutoFillProfile -> AutofillProfile renaming:
http://codereview.chromium.org/
6658030
Moved from AutofillType to AutofillFieldType, upstream CL:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_profile.h?r1=77630&r2=78518&pathrev=88489
Change-Id: Ie54a0054221d28b20622f94dd882975c73a5aec1
Kristian Monsen [Thu, 7 Jul 2011 14:59:20 +0000 (15:59 +0100)]
Merge Chromium at r12.0.742.93: Snapstart error code removed
Snapstart error code removed upstream, removing it from our list
as well.
Chromium CL:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/net_error_list.h?r1=76644&r2=81288&pathrev=88489
Change-Id: I80966819f04d13d73608dfb2d1510eabe4a64f38
Kristian Monsen [Thu, 7 Jul 2011 14:44:56 +0000 (15:44 +0100)]
Merge Chromium at r12.0.742.93: CookiePolicy update
Async functionality removed, and const added. Needed to make
the Mutex mutable so it can be changed in the const function.
Chromium CL:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/cookie_policy.h?view=diff&pathrev=88489&r1=80659&r2=80660
Change-Id: Ib8898076cd6a22ccac4f719bc9ed437bf36d7b44
Kristian Monsen [Thu, 7 Jul 2011 14:38:18 +0000 (15:38 +0100)]
Merge Chromium at r12.0.742.93: Updating include paths
chromium CL:
http://codereview.chromium.org/
6714032
Also fix another orderding when I was there.
Change-Id: Ie3d53bc3816760f8f0d1a41c5d458968c35afc80
Steve Block [Thu, 7 Jul 2011 09:37:15 +0000 (02:37 -0700)]
Merge "Avoid leaking JNI local references in UrlInterceptResponse"
Teng-Hui Zhu [Wed, 6 Jul 2011 17:52:55 +0000 (10:52 -0700)]
Merge "Refactor partial invalidation code"
Russell Brenner [Wed, 6 Jul 2011 17:09:36 +0000 (10:09 -0700)]
Merge "Remove old scalar conversions"
Teng-Hui Zhu [Fri, 1 Jul 2011 23:40:35 +0000 (16:40 -0700)]
Refactor partial invalidation code
Change-Id: Id8612946d845daad86f02f626c3247ff8dc1d2f8
Steve Block [Wed, 6 Jul 2011 12:14:52 +0000 (13:14 +0100)]
Avoid leaking JNI local references in UrlInterceptResponse
Bug:
4509854
Change-Id: I70bd6b5f1ce32263b1f048a7bb5e732338e7297d
Shimeng (Simon) Wang [Sat, 2 Jul 2011 01:24:22 +0000 (18:24 -0700)]
Merge "Factor the scale into the actual screen space calculation."
Shimeng (Simon) Wang [Sat, 2 Jul 2011 00:34:23 +0000 (17:34 -0700)]
Factor the scale into the actual screen space calculation.
issue:
4982074
Change-Id: I5d86539a17393f3060cd67bd4c6888734037c7e4
Russell Brenner [Sat, 2 Jul 2011 00:04:06 +0000 (17:04 -0700)]
Remove old scalar conversions
The webkit merge from CL 112610 introduced an api change in
setrectForUnderline, changing two params from int to float. The body
of the function, however, was still performing int to float
conversions, resulting in a debug assert within skia and conversion
results forced to zero. This CL removes the outdated conversion.
Change-Id: I0d5fae39552c3e6801b83e6c4363dc063a01b165
Shimeng (Simon) Wang [Sat, 2 Jul 2011 00:06:05 +0000 (17:06 -0700)]
Merge "meta format-detection is not a viewport meta tag."
Huahui Wu [Wed, 29 Jun 2011 21:25:20 +0000 (14:25 -0700)]
b/
3302378 Passes touch pressures, sizes and timestamps to Webkit
Related CL in framework:
https://android-git.corp.google.com/g/#change,118420
Change-Id: I337de51ed478fad34fc07854eadf6a38dd5b85f1
Shimeng (Simon) Wang [Fri, 1 Jul 2011 22:27:58 +0000 (15:27 -0700)]
meta format-detection is not a viewport meta tag.
This reverts some of my previous change which wrongly treats
format-detection as a viewport change.
issue:
4975315
Change-Id: Icb3ab9b813010b253a59fca6992deb1aa4d186e7
Shimeng (Simon) Wang [Fri, 1 Jul 2011 21:41:13 +0000 (14:41 -0700)]
Merge "Update viewport using webkit's way."
Kristian Monsen [Fri, 1 Jul 2011 14:57:51 +0000 (15:57 +0100)]
Possible fix for bug
3335863: 3-second delay before Incognito state is cleared
Force removing pending PageCache deletes when
deleting a WebView.
Change-Id: Ibd62f7b841e311a907c01a626834559b3bd9f263
Shimeng (Simon) Wang [Fri, 1 Jul 2011 18:02:59 +0000 (11:02 -0700)]
Update viewport using webkit's way.
The Android's customized way of parsing viewport meta tags is kept intact;
while the viewport update notification mechanism is changed to use webkit's
way. This gives much better notification of viewport switching.
issue:
4975315
Change-Id: I7896b67d684efec015245ee804a9243e72ff0b50
Chris Craik [Fri, 1 Jul 2011 17:52:57 +0000 (10:52 -0700)]
Merge "Modified tile reclamation heuristic for multi-webview display"
Chris Craik [Fri, 1 Jul 2011 17:27:35 +0000 (10:27 -0700)]
Modified tile reclamation heuristic for multi-webview display
When tiles are reclaimed, they are now taken first from webviews that haven't
been drawn in a while. Previously they were taken from any other webview - which
may have been one still being displayed if multiple are onscreen.
bug:
4049143 partially solved (still not enough graphics memory allocated for
tiles on tablet devices)
Change-Id: Id400ea28e92ba805120c8353881834157fefa483
Teng-Hui Zhu [Fri, 1 Jul 2011 17:02:37 +0000 (10:02 -0700)]
Merge "Update to match the Java side change"
Teng-Hui Zhu [Fri, 1 Jul 2011 17:01:57 +0000 (10:01 -0700)]
Merge "Remove libsurfaceflinger_client while keeping it for AOSP"
Teng-Hui Zhu [Fri, 1 Jul 2011 15:59:56 +0000 (08:59 -0700)]
Remove libsurfaceflinger_client while keeping it for AOSP
Change-Id: I959a27e8d163158b013251b16eaf3f9f7542ded6
Kristian Monsen [Fri, 1 Jul 2011 15:04:15 +0000 (08:04 -0700)]
Merge changes I899af0a4,I1d8b554a,Iefb91f0b
* changes:
Merge Chromium at r11.0.696.0: Compile fix, update include location
Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc
Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renaming
Teng-Hui Zhu [Thu, 30 Jun 2011 23:37:22 +0000 (16:37 -0700)]
Update to match the Java side change
Java side change: #change,118782
Change-Id: I9f94f2541a2dd197a77210566fb3a8d28102010c
Chris Craik [Thu, 30 Jun 2011 18:40:45 +0000 (11:40 -0700)]
Merge "Refactoring: Moved 'SkLayer' to 'Layer' class in webkit"
Chris Craik [Thu, 30 Jun 2011 18:33:27 +0000 (11:33 -0700)]
Refactoring: Moved 'SkLayer' to 'Layer' class in webkit
Change-Id: Ie1c24e5e402c539e0359810cfdf872178fa083c1
Derek Sollenberger [Thu, 30 Jun 2011 18:27:40 +0000 (11:27 -0700)]
Merge "Add initial support for Ganesh renderer."
Derek Sollenberger [Thu, 30 Jun 2011 16:54:21 +0000 (12:54 -0400)]
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
Teng-Hui Zhu [Wed, 29 Jun 2011 23:48:13 +0000 (16:48 -0700)]
Don't create newer LayerTexture when hitting upper bound.
bug:
4976882
Change-Id: If1c913da8bdc3a310a3a665dc895711093fb8788
Kristian Monsen [Thu, 30 Jun 2011 12:40:43 +0000 (13:40 +0100)]
Merge Chromium at r11.0.696.0: Compile fix, update include location
chrome/browser/tab_contents/tab_contents.h has moved to
content/browser/tab_contents/tab_contents.h
Change-Id: I899af0a4895f0d6a30850c65c22fbc67c7bedd88
Mathias Agopian [Thu, 30 Jun 2011 00:51:52 +0000 (17:51 -0700)]
Revert "remove dependency on libsurfaceflinger_client"
This reverts commit
95aac6ac538d94a3a806c66c0e40696fa545b5d0.
this change broke the master-gpl build.
Change-Id: I5eb8fe2878fac61a5c556e5507778fb950f9ed12
Chris Craik [Thu, 30 Jun 2011 00:02:09 +0000 (17:02 -0700)]
Merge "Added fix for AndroidAnimation copy (m_name was forgotten)"
Chris Craik [Wed, 29 Jun 2011 22:49:56 +0000 (15:49 -0700)]
Added fix for AndroidAnimation copy (m_name was forgotten)
bug:
4595809
Change-Id: Ieaacb3cf7c6ea51f2ae7d92e5acf5c9fcafcf1d8
Mathias Agopian [Fri, 25 Mar 2011 21:18:59 +0000 (14:18 -0700)]
remove dependency on libsurfaceflinger_client
Change-Id: Ic6774c7141dee754bb3efc19a4b8e9675eaf2f51
Shimeng (Simon) Wang [Wed, 29 Jun 2011 18:23:40 +0000 (11:23 -0700)]
Merge "Use full scrollable area for content width/height."
Kristian Monsen [Mon, 27 Jun 2011 09:42:57 +0000 (10:42 +0100)]
Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc
Members in UrlRequestContext was made private in:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165
Using setter to set instead of using variable directly.
Change-Id: I1d8b554a1f017d39acbf5ae014e934631c29049b
Kristian Monsen [Mon, 27 Jun 2011 09:47:13 +0000 (10:47 +0100)]
Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renaming
Change-Id: Iefb91f0b784c26b503125017ae3582a28e7d530d
Kristian Monsen [Wed, 29 Jun 2011 14:02:28 +0000 (07:02 -0700)]
Merge "Revert Android specific method name"
Kristian Monsen [Wed, 29 Jun 2011 13:17:17 +0000 (14:17 +0100)]
Revert Android specific method name
The name change was reverted in external/chromium in:
https://android-git.corp.google.com/g/#change,118320
This fixes external/webkit after that change.
Change-Id: I21ff90a8759deee1799e718e0bac06b165477606
Derek Sollenberger [Wed, 29 Jun 2011 12:33:11 +0000 (05:33 -0700)]
Merge "Add BaseRenderer to handle generic rendering tasks."