OSDN Git Service
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
Shimeng (Simon) Wang [Sat, 2 Jul 2011 00:06:05 +0000 (17:06 -0700)]
Merge "meta format-detection is not a viewport meta tag."
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."
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."
Derek Sollenberger [Mon, 27 Jun 2011 22:16:45 +0000 (18:16 -0400)]
Add BaseRenderer to handle generic rendering tasks.
Change-Id: I5cf0e2da4d4f48be5daf176b5aac8222b9919ba9
Shimeng (Simon) Wang [Wed, 29 Jun 2011 01:18:47 +0000 (18:18 -0700)]
Use full scrollable area for content width/height.
Currently after webkit merge, the content width/height is only
for visible area.
issue:
4672075
Change-Id: Ib7d51119a59131f1443a3c0d59980a8da34b4173
Huahui Wu [Tue, 28 Jun 2011 23:25:56 +0000 (16:25 -0700)]
Merge "2nd try: Bubbles up the url that has the invalid certificate."
Huahui Wu [Tue, 28 Jun 2011 17:18:05 +0000 (10:18 -0700)]
2nd try: Bubbles up the url that has the invalid certificate.
Same as this CL
https://android-git.corp.google.com/g/#change,117817
except one minor change to make the build happy:
Change-Id: Ie863737eee00c42de5d7a289b60aff8c2cfaa8e2
Derek Sollenberger [Tue, 28 Jun 2011 18:57:05 +0000 (11:57 -0700)]
Merge "Cleanup Skia related rendering code for raster rendering."
Derek Sollenberger [Tue, 28 Jun 2011 13:33:24 +0000 (09:33 -0400)]
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
Huahui Wu [Tue, 28 Jun 2011 17:13:10 +0000 (10:13 -0700)]
Merge "Revert "Bubbles up the url that has the invalid certificate.""
Huahui Wu [Tue, 28 Jun 2011 17:10:56 +0000 (10:10 -0700)]
Revert "Bubbles up the url that has the invalid certificate."
This reverts commit
f072ccf633e8c2c2812289f0e65f18320f2147c8.
Huahui Wu [Tue, 28 Jun 2011 16:38:35 +0000 (09:38 -0700)]
Merge "Bubbles up the url that has the invalid certificate."
Teng-Hui Zhu [Tue, 28 Jun 2011 15:57:58 +0000 (08:57 -0700)]
Merge "Delete the GL texture when deleting the Surface Texture"
Teng-Hui Zhu [Tue, 28 Jun 2011 00:36:10 +0000 (17:36 -0700)]
Delete the GL texture when deleting the Surface Texture
Otherwise, there will be GPU memory leak.
bug:
4947376
Change-Id: Ib76a47c197d7c1a01471c4b38e210e0d5dd9fa02
John Reck [Tue, 28 Jun 2011 00:25:34 +0000 (17:25 -0700)]
Merge "Prevent GL rings on layers"
John Reck [Tue, 28 Jun 2011 00:16:21 +0000 (17:16 -0700)]
Prevent GL rings on layers
Bug:
4496611
Rings on layers are still drawn with the software path, but the
gl ones are also drawn and in the wrong location. For now, prevent
the drawing of the incorrect GL rings
Change-Id: I7436dec9da3ce936b2ed0c4aa549a31b00e6e066
Derek Sollenberger [Mon, 27 Jun 2011 21:15:23 +0000 (14:15 -0700)]
am
293cc036: am
96b31381: (-s ours) Merge "Update WebKit to work with the latest Skia (r1562)."
* commit '
293cc0366a30e156ff00ec8dbc63e905bd33cba5':
Update WebKit to work with the latest Skia (r1562).
Derek Sollenberger [Mon, 27 Jun 2011 17:28:16 +0000 (13:28 -0400)]
Refactor and improve the raster rendering for base tiles.
Change-Id: I1dc4622e0ce1602f6dc314f0b510c41adb95a443
Huahui Wu [Mon, 27 Jun 2011 17:53:00 +0000 (10:53 -0700)]
Bubbles up the url that has the invalid certificate.
b/
2689122 SSL error shows the wrong page when triggered by an image/javascript in the page
This CL bubbles the url, which has the invalid cert, up to framework to display it.
Related CLs are:
Framework: https://android-git.corp.google.com/g/#change,117828
Browser: https://android-git.corp.google.com/g/#change,117835
Change-Id: If01ea2320aa50450a6d3d409123bed5a9f101d61
Teng-Hui Zhu [Fri, 24 Jun 2011 21:37:35 +0000 (14:37 -0700)]
Merge "Browser ST: Support both OES and 2D texture target"
Derek Sollenberger [Fri, 24 Jun 2011 20:51:55 +0000 (13:51 -0700)]
am
96b31381: (-s ours) Merge "Update WebKit to work with the latest Skia (r1562)."
* commit '
96b3138148c51cb4ad4bddca665fc528677dd182':
Update WebKit to work with the latest Skia (r1562).
Teng-Hui Zhu [Wed, 22 Jun 2011 00:05:38 +0000 (17:05 -0700)]
Browser ST: Support both OES and 2D texture target
B/c of driver limitation, we are using 2D texture target for our Surface
Texture, this will be switched to EXTERNAL_OES soon. In order to have smooth
transition, I added the code which can handle both types and it depends on what
Surface Texture itself reports.
Tested with both modes on Crespo since its driver support both.
bug:
4905428
Change-Id: Ic91702e7b8f75329f7d948e9217f7fc689a95bbb
Derek Sollenberger [Fri, 24 Jun 2011 18:30:07 +0000 (11:30 -0700)]
Merge "Update WebKit to work with the latest Skia (r1562)."
Derek Sollenberger [Thu, 23 Jun 2011 19:33:53 +0000 (15:33 -0400)]
Update WebKit to work with the latest Skia (r1562).
Change-Id: Iefa4e71603cfdfd8ecaff61994c007853cab2970
Shimeng (Simon) Wang [Thu, 23 Jun 2011 22:38:49 +0000 (15:38 -0700)]
Better way to determine not to reflow.
Instead of using border which may be too broad, using whether an object
is floating to fix flickr's reflow issue. Checked sites like slashdot.org
and nytimes.com, this works better.
issue:
4596265
Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
Shimeng (Simon) Wang [Thu, 23 Jun 2011 18:53:30 +0000 (11:53 -0700)]
Merge "Do not reflow text if a div has border."
Shimeng (Simon) Wang [Thu, 23 Jun 2011 17:52:02 +0000 (10:52 -0700)]
Do not reflow text if a div has border.
This also fixes the case where flickr header's position
is not good since it's reflowed for issue
4596265.
issue:
4596265
Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
John Reck [Thu, 23 Jun 2011 16:39:52 +0000 (09:39 -0700)]
Merge "Remove legacy fps cap"
Teng-Hui Zhu [Wed, 22 Jun 2011 22:47:15 +0000 (15:47 -0700)]
Tiles: increase the minimal number to cover the whole screen
Change-Id: Iad5ef9dc1f9944a326e45dd2721cb0005e69f425
John Reck [Thu, 23 Jun 2011 00:23:39 +0000 (17:23 -0700)]
Remove legacy fps cap
Bug:
4743033
Change-Id: Ic0603ecf3af9290bd6d374aa8ddf4342948064ac
Teng-Hui Zhu [Wed, 22 Jun 2011 18:42:43 +0000 (11:42 -0700)]
Browser ST: Lower the upper limit for texture allocation
Change-Id: Ie88de19e89e298b69b106fbb42d2b9d26bb98014
Teng-Hui Zhu [Wed, 22 Jun 2011 16:37:16 +0000 (09:37 -0700)]
Merge "Fix compiler error when DEBUG is turned on"
Shimeng (Simon) Wang [Wed, 22 Jun 2011 00:53:08 +0000 (17:53 -0700)]
Merge "Remove old customized code."
Teng-Hui Zhu [Tue, 21 Jun 2011 22:37:20 +0000 (15:37 -0700)]
Fix compiler error when DEBUG is turned on
Change-Id: I1a9d8eab3e5259eade94fc9e825ec4d162a1e392
Shimeng (Simon) Wang [Tue, 21 Jun 2011 21:24:32 +0000 (14:24 -0700)]
Remove old customized code.
This fixes slashdot.org after recent webkit merge, since the removed code
will sometimes require extra layout.
This code is two years old, and related to iframe flattening, which
is not used any more in Android. Android still does frameset flattening.
Verified sites such as developer.android.com are still working.
issue:
4753055
Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510
Teng-Hui Zhu [Tue, 21 Jun 2011 20:02:13 +0000 (13:02 -0700)]
Merge "Fix the Surface Texture Issue on the phones"
Teng-Hui Zhu [Tue, 21 Jun 2011 17:13:49 +0000 (10:13 -0700)]
Fix the Surface Texture Issue on the phones
Change-Id: Ibee33c53d65a6c1b98f5e88ed79862cd30418347
Ben Murdoch [Tue, 21 Jun 2011 17:14:02 +0000 (10:14 -0700)]
Merge changes I1f457d1e,I365930f3,Iad35a220
* changes:
Fix storage/transaction-error-callback.html
Fix fast/encoding/dumpAsText//utf-16-no-bom.xml
Add android-specific result for fast/encoding/meta-in-script.html
Ben Murdoch [Tue, 21 Jun 2011 15:42:28 +0000 (16:42 +0100)]
Fix storage/transaction-error-callback.html
Update Android specific result after change to V8 error reporting.
See http://trac.webkit.org/changeset/77374
Change-Id: I1f457d1e159eb4a7c1ba35a8f370490efd924b07
Ben Murdoch [Tue, 21 Jun 2011 12:50:35 +0000 (13:50 +0100)]
Fix fast/encoding/dumpAsText//utf-16-no-bom.xml
This test now expects us to use the XMLTreeViewer, so make
sure that it's enabled.
SetDeveloperExtras enables the XMLTreeViewer and Inspector, but
we have no inspector on Android, so this is just toggling the
XMLTreeViewer on.
Change-Id: I365930f34003d6e97aed88af77746c784a3c3bd1
Ben Murdoch [Tue, 21 Jun 2011 10:02:30 +0000 (11:02 +0100)]
Add android-specific result for fast/encoding/meta-in-script.html
Currently failing on Android due to difference in output of V8 vs. JSC.
See http://trac.webkit.org/changeset/73797
Change-Id: Iad35a22066d18d8e1c5d292bbf86574cdbb77f38
Teng-Hui Zhu [Mon, 20 Jun 2011 22:38:29 +0000 (15:38 -0700)]
The background image should be opaque
bug:
4406718
Change-Id: Iea532c639bf41aad2488819d42c315a0e3d747fd
Teng-Hui Zhu [Mon, 20 Jun 2011 21:24:59 +0000 (14:24 -0700)]
Copied into Surface Texture line by line instead of pixel by pixel.
Change-Id: Ide38fce4ba0be0eb506cb4c5497915e11812b6bd
Teng-Hui Zhu [Fri, 17 Jun 2011 23:28:27 +0000 (16:28 -0700)]
Merge "Turn the Surface Texture path on for baseTile"
Teng-Hui Zhu [Fri, 17 Jun 2011 18:35:07 +0000 (11:35 -0700)]
Turn the Surface Texture path on for baseTile
Change-Id: I852c546b2c62419ccfb96ed1c0d157e49a3b1aef
Shimeng (Simon) Wang [Fri, 17 Jun 2011 21:18:11 +0000 (14:18 -0700)]
Merge "Ignore the initial empty document when setting viewport size."
John Reck [Fri, 17 Jun 2011 17:51:19 +0000 (10:51 -0700)]
Merge "Change mTextSize to be a percentage"
Shimeng (Simon) Wang [Fri, 17 Jun 2011 17:42:40 +0000 (10:42 -0700)]
Ignore the initial empty document when setting viewport size.
This fixes the issue where "google legal" dialog will show
empty content, since the initial empty document will get laid
out and used in some circumstances.
issue:
4501857
Change-Id: I779d983f3c81724663391872de81ceed025adec1
Teng-Hui Zhu [Fri, 17 Jun 2011 16:00:47 +0000 (09:00 -0700)]
Merge "Interface clean up for porting Surface Texture, no functional change."
Teng-Hui Zhu [Thu, 16 Jun 2011 21:27:09 +0000 (14:27 -0700)]
Interface clean up for porting Surface Texture, no functional change.
Change-Id: I0d43dd94a1bb4666d20a39b2b272337e89a21d8b
John Reck [Fri, 17 Jun 2011 00:07:05 +0000 (17:07 -0700)]
Change mTextSize to be a percentage
Change-Id: I22720665be2900121acaa3801adc36f3d7fddeae
Ben Murdoch [Thu, 16 Jun 2011 17:28:33 +0000 (18:28 +0100)]
Fix rounded rectangle background colour.
Apply WebKit change http://trac.webkit.org/changeset/83002 to
our GraphicsContext port.
Bug:
4674341
Change-Id: I1399ae0f12aff3f24417a7d6f36006a73e8e48ff
Shimeng (Simon) Wang [Thu, 16 Jun 2011 01:27:24 +0000 (18:27 -0700)]
Merge "Set appropriate initial viewport bounds."
Shimeng (Simon) Wang [Thu, 16 Jun 2011 01:13:57 +0000 (18:13 -0700)]
Set appropriate initial viewport bounds.
This fixes lots of cases where various legal/license dialog show
empty content.
issue:
4501857
Change-Id: I113b1b43ec1b2f17fad4bf9fbf6aa17f8b10240c
Ben Murdoch [Thu, 16 Jun 2011 00:50:59 +0000 (17:50 -0700)]
Merge "Rmove unnecessary passing of unused parameter"
Ben Murdoch [Thu, 16 Jun 2011 00:32:00 +0000 (01:32 +0100)]
Rmove unnecessary passing of unused parameter
Requires a change in external/chromium, see
If349cd2ffd56b9f539d4ebdb8944964fc57289e5
Change-Id: I88d7c291ee1ffd1b1c413ffaf59acf5e4ae57c78
Teng-Hui Zhu [Wed, 15 Jun 2011 21:30:34 +0000 (14:30 -0700)]
Fix the crash caused by recent webkit RenderLayerCompositor change
We used to rely on the fact that RenderLayerBacking is the only subclass of
GraphicsLayerClient, but now the RenderLayerCompositor also inherit it and
is used for iframe. That cause us to get invalid pointer in GraphicsLayerAndroid.
The solution here is to disable the new webkit approach b/c we have our own
iframe support already.
bug:
4592195
Change-Id: Ia786233907d83028fdc6865c28fbbd5291564ad0
John Reck [Wed, 15 Jun 2011 16:12:06 +0000 (09:12 -0700)]
Merge "Support for getting the background color"
Kristian Monsen [Wed, 15 Jun 2011 03:58:00 +0000 (20:58 -0700)]
Merge changes I637b26fb,Icf028ea9
* changes:
Merge Chromium at r11.0.672.0: Fix autofill
Merge Chromium at r11.0.672.0: Compile fixes
Steve Block [Tue, 14 Jun 2011 23:04:04 +0000 (00:04 +0100)]
Fix build by adding missing WebTiming bindings file
Change-Id: I959b25a9447154395f168132f908c0f4512d4be6
John Reck [Tue, 14 Jun 2011 22:18:47 +0000 (15:18 -0700)]
Support for getting the background color
Change-Id: Ia8b0f97a5d50b3c16b8d59bb7af42899a614b676
Steve Block [Mon, 13 Jun 2011 22:23:54 +0000 (23:23 +0100)]
Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMING
Bug:
4442995
Change-Id: I9c37d7022946fd66e1ee635328182bf1456b0de7
Steve Block [Mon, 13 Jun 2011 20:32:43 +0000 (21:32 +0100)]
Cherry-pick WebKit change 85873 to fix a performance timing bug
See http://trac.webkit.org/changeset/85873
Bug:
4442995
Change-Id: I27c5d678a534ec0b64d59868f6f77e51c477e89d
Steve Block [Fri, 10 Jun 2011 16:07:33 +0000 (17:07 +0100)]
Merge WebKit at branches/chromium/742 r88085: Update ThirdPartyProject.prop
Change-Id: Ic297de43b73b2ebce1d20053990f9d71bb54a16f
Steve Block [Fri, 10 Jun 2011 16:30:46 +0000 (17:30 +0100)]
Merge WebKit at branches/chromium/742 r88085: Implement new ChromeViewClient::webView()
This is only required on Chromoium
See http://trac.webkit.org/changeset/85823
Change-Id: I61069d27bfbdabb88474c759e2bb8723e5913783
Steve Block [Fri, 10 Jun 2011 15:52:27 +0000 (16:52 +0100)]
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Steve Block [Mon, 13 Jun 2011 21:06:20 +0000 (22:06 +0100)]
Move all ANDROID defines to wtf/Platform.h
This patch moves many defines from WebCore/config.h to keep
all of the Android defines together.
Also, WebCore/config.h should not be used by JavaScriptCore
(though currently it is on Android), whereas wtf/Platform.h
is always included.
Some Android defines in WebCore/config.h are already usptreamed,
but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602
Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af
Russell Brenner [Mon, 13 Jun 2011 18:50:54 +0000 (11:50 -0700)]
Merge "Add javascript 'select' event"
Russell Brenner [Fri, 10 Jun 2011 17:58:48 +0000 (10:58 -0700)]
Add javascript 'select' event
The jni code uses lower-level apis for controlling text selections
that are hard-wired as non-user actions. This change adds an
additional call from the jni code to signal that the selection
changed due to user action.
Bug:
4444489
Change-Id: I5a637ad9826455e21d43d1e28476b1c814cb65f7
John Reck [Mon, 13 Jun 2011 17:41:35 +0000 (10:41 -0700)]
Merge "Ignore webkit-text-size-adjust: none"
John Reck [Wed, 25 May 2011 22:44:55 +0000 (15:44 -0700)]
Ignore webkit-text-size-adjust: none
Bug:
4486008
Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
Ben Murdoch [Fri, 10 Jun 2011 16:13:42 +0000 (17:13 +0100)]
Clarify comments about initialising V8 in WebViewCore ctor.
Change-Id: Icad45701d81d3ff07470ee2f6d2087c3a3252e84
Ben Murdoch [Fri, 10 Jun 2011 14:04:35 +0000 (15:04 +0100)]
Cleanspec after V8 Crankshaft is configurable in makefile.
Change-Id: Iefed33742e16e18fb762cc259153bf9fd584336a