OSDN Git Service
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
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
Ben Murdoch [Thu, 9 Jun 2011 16:03:33 +0000 (17:03 +0100)]
Merge WebKit at r84325: Update ThirdPartyProject.prop
Change-Id: I3bd83b97b64c96cc5518cd7c5e4135421a9609f5
Ben Murdoch [Mon, 6 Jun 2011 17:46:54 +0000 (18:46 +0100)]
Merge WebKit at r74325: Build fix.
Cherry pick of upstream patch http://trac.webkit.org/changeset/87424
Change-Id: I6546831e7cecf11bbfd194f0620c56f293b56f2d
Ben Murdoch [Fri, 10 Jun 2011 13:53:17 +0000 (14:53 +0100)]
Merge WebKit at r84325: Fix MediaControls.
Shadow DOM work needs to be applied to our local edits to make
SliderThumb work with touch events.
Several upstream changes are relevant...
http://trac.webkit.org/changeset/83256
http://trac.webkit.org/changeset/83397
http://trac.webkit.org/changeset/83545
http://trac.webkit.org/changeset/84222
Change-Id: Ie653c87e6e1d823c50ee22c406aaa79a22bcf530
Ben Murdoch [Tue, 7 Jun 2011 12:24:18 +0000 (13:24 +0100)]
Merge Webkit at r84325: Fix SelectText.cpp
BidiRun is no longer stored on BidiResolver - it has it's
own class. Update our code to reflect this.
See http://trac.webkit.org/changeset/83240
Change-Id: Ib5ec7e585a531605f55bcc5530b2039fd11f8115
Ben Murdoch [Tue, 7 Jun 2011 10:45:31 +0000 (11:45 +0100)]
Merge WebKit at r84325: Fix uses of JavaInstance.
The JavaInstance class is now an interface, so use the
provided JavaInstanceJobject implementation instead.
See http://trac.webkit.org/changeset/82950
Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
Ben Murdoch [Tue, 7 Jun 2011 10:29:37 +0000 (11:29 +0100)]
Merge WebKit at r84325: Fix EditorClientAndroid.
Update EditorClient ::requestCheckingOfString with new
parameter.
See http://trac.webkit.org/changeset/82952
Change-Id: I36b1708ded2dca0210cba593b660f2a47f7e3609
Ben Murdoch [Tue, 7 Jun 2011 10:26:09 +0000 (11:26 +0100)]
Merge WebKit at r84325: Fix FrameLoaderClient.
Update signatures for dispatchDidReceiveTitle and setTitle with
new parameter.
See http://trac.webkit.org/changeset/82580
Change-Id: I2a74302b7f43d70103680752fba1e80b5272fb7f
Ben Murdoch [Mon, 6 Jun 2011 17:29:13 +0000 (18:29 +0100)]
Merge WebKit at r84325: Fix RenderLayerCompositor.cpp
iframe compositing propogation now works for <object> and framesets so
the methods have been renamed - implement that renaming in our code.
See http://trac.webkit.org/changeset/83518
Change-Id: Id1fd6d47f5ac4546f6eddf443658b4b481542292
Ben Murdoch [Mon, 6 Jun 2011 17:05:11 +0000 (18:05 +0100)]
Merge WebKit at r84325: Fix GraphicsContextAndroid.cpp
GraphicsContext::roundToDevicePixels has a new parameter.
See http://trac.webkit.org/changeset/83216
Change-Id: I9f215b450c790ac1e6a54959e5cbee43d3a25694
Ben Murdoch [Thu, 9 Jun 2011 12:37:56 +0000 (13:37 +0100)]
Merge WebKit at r84325: Fix ImageBufferData.h
Need to include the Android ImageBufferData header. To avoid recursive
includes, rename android/ImageBufferData.h to
android/ImageBufferDataAndroid.h
See http://trac.webkit.org/changeset/83786
Change-Id: Ica2d0c5350810b918d034d0ac227eb6255939584
Ben Murdoch [Mon, 6 Jun 2011 12:20:18 +0000 (13:20 +0100)]
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
Ben Murdoch [Thu, 9 Jun 2011 12:37:59 +0000 (13:37 +0100)]
Merge WebKit at r84325: Fix conflicts.
Platform.h
ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997)
WTF_USE_SKIA (http://trac.webkit.org/changeset/84106)
JSNavigatorCustom.cpp
V8NavigatorCustom.cpp
ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287)
CSSStyleSelector.cpp
ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986)
Document.cpp
ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349)
ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992)
HTMLInputElement.cpp
ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534)
RangeInputType.cpp
ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/)
ChromeClient.h
ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375)
EventHandler.cpp
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522)
Settings
ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201)
ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628)
Gradient.cpp
Graphicscontext.cpp
HTMLCanvasElement.cpp
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088)
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101)
PluginView.h
ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071)
RenderBox.h
ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611)
RenderIframe.cpp (moved code to RenderPart.cpp)
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518)
RenderLayer.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899)
RenderLayer.h
RenderLayerBacking.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820)
Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
Ben Murdoch [Thu, 2 Jun 2011 11:07:03 +0000 (12:07 +0100)]
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Ben Murdoch [Fri, 10 Jun 2011 09:41:12 +0000 (10:41 +0100)]
Remove files from the top level directory that we don't need.
These files aren't used by Android and have been maintained poorly
through merges so just remove them.
Change-Id: Ia0651092b6ac7e5b9cdee557949f296fe1465146
Kristian Monsen [Thu, 9 Jun 2011 20:53:00 +0000 (21:53 +0100)]
Fix build break for emulator
JavaTypeString is only available for V8.
Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
Brian Carlstrom [Thu, 9 Jun 2011 19:36:44 +0000 (12:36 -0700)]
Merge "Implement net::URLRequest::Delegate::OnCertificateRequested"
Steve Block [Thu, 9 Jun 2011 18:59:55 +0000 (19:59 +0100)]
Fix a bug in the V8 JNI bindings when creating JNI method signatures
This was introduced by the latest merge to WebKit r82507. WebKit now
uses a new JavaTypeString, distinct from JavaTypeObject, for
representing strings in the JNI bridge. We need to account for this
when building the JNI method signature.
See https://bugs.webkit.org/show_bug.cgi?id=62389 for details.
Bug:
4585284
Change-Id: I6a54679b954c32bf03d715da3c958c61baa5fecc
Brian Carlstrom [Thu, 2 Jun 2011 08:05:19 +0000 (01:05 -0700)]
Implement net::URLRequest::Delegate::OnCertificateRequested
Following the example of OnSSLCertificateError, implement OnCertificateRequested
ERROR CASE CLIENT CERT CASE
net::URLRequest::Delegate::OnSSLCertificateError net::URLRequest::Delegate::OnCertificateRequested
WebRequest::OnSSLCertificateError WebRequest::OnCertificateRequested
WebUrlLoaderClient::reportSslCertError WebUrlLoaderClient::requestClientCert
WebFrame::reportSslCertError WebFrame::requestClientCert
android.webkit.BrowserFrame.reportSslCertError android.webkit.BrowserFrame.requestClientCert
<... See frameworks/base ...> <... See frameworks/base ...>
android.webkit.BrowserFrame.nativeSslCertErrorProceed android.webkit.BrowserFrame.nativeSslClientCert
WebCoreFrameBridge::SslCertErrorProceed WebCoreFrameBridge::SslClientCert
WebUrlLoaderClient::proceedSslCertError WebUrlLoaderClient::sslClientCert
WebRequest::proceedSslCertError WebRequest::sslClientCert
net::URLRequest::ContinueDespiteLastError net::URLRequest::ContinueWithCertificate
Change-Id: I6513678a3c553bf329640119ff96df9a39a41e49
John Reck [Wed, 8 Jun 2011 15:58:28 +0000 (08:58 -0700)]
Merge "Serialize LayerAndroid"
Steve Block [Wed, 8 Jun 2011 15:26:01 +0000 (08:26 -0700)]
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
Steve Block [Tue, 7 Jun 2011 14:53:41 +0000 (15:53 +0100)]
Merge WebKit at r82507: Update ThirdPartyProject.prop
Change-Id: I55c6d71a66d40ec65751b040c6cc1cb383b7f691
Steve Block [Mon, 6 Jun 2011 12:43:08 +0000 (13:43 +0100)]
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
See http://trac.webkit.org/changeset/88166
Change-Id: Ifb3277d49c14dd600979c8c21c876ed8bc0e4a62
Steve Block [Wed, 8 Jun 2011 14:18:16 +0000 (15:18 +0100)]
Merge WebKit at r82507: Work around a V8 bug
Change-Id: Ia1b847a20bc16091075630655fef79cd90cd8297
Steve Block [Tue, 7 Jun 2011 14:45:49 +0000 (15:45 +0100)]
Merge WebKit at r82507: JNIType renamed to JavaType
See http://trac.webkit.org/changeset/81860
Change-Id: I7ba9cf3f5a739f4d94e9189f6eb6dd4f8f645787
Steve Block [Fri, 3 Jun 2011 12:35:12 +0000 (13:35 +0100)]
Merge WebKit at r82507: IconDatabaseClient interface expanded
See http://trac.webkit.org/changeset/81719
Change-Id: Ida2b2a8ac767182bc2c93cbe60399ed39f91c99c
Steve Block [Fri, 3 Jun 2011 14:16:57 +0000 (15:16 +0100)]
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
See http://trac.webkit.org/changeset/81213
Change-Id: I1280ec90bd80fbb5cb4450e892f96678b988fa66
Kristian Monsen [Tue, 7 Jun 2011 15:19:24 +0000 (16:19 +0100)]
Merge Chromium at r11.0.672.0: Fix autofill
Major refactoring in CL:
http://codereview.chromium.org/
5958021
Created wrapper function to call in chromium CL:
https://android-git.corp.google.com/g/#change,113980
Change-Id: I637b26fb2e3ccb544adfc818b94047ef5a2c5aad
Kristian Monsen [Tue, 7 Jun 2011 15:19:58 +0000 (16:19 +0100)]
Merge Chromium at r11.0.672.0: Compile fixes
WebRequestContext.h:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924
Other files:
base/lock.h moved to base/synchronization/lock.h contents
to base namespace:
http://codereview.chromium.org/
6018013
Change-Id: Icf028ea9cd32746c6681751bc86935aefb7c0084
Steve Block [Fri, 3 Jun 2011 13:56:51 +0000 (14:56 +0100)]
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
See http://trac.webkit.org/changeset/81484
Change-Id: I72f818d5d0075c63b658c2d8457d2182a7968c05
Steve Block [Fri, 3 Jun 2011 13:43:36 +0000 (14:43 +0100)]
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
See http://trac.webkit.org/changeset/81824
Change-Id: I2e3b588b7d38211310bd6bf488f1a8d3f6edac5d