OSDN Git Service
Nicolas Roard [Tue, 19 Oct 2010 01:11:00 +0000 (18:11 -0700)]
am
7fc27f09: (-s ours) am
3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Merge commit '
7fc27f0903bfc72035faff876d0673c9064085ac'
* commit '
7fc27f0903bfc72035faff876d0673c9064085ac':
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Ben Murdoch [Mon, 18 Oct 2010 23:41:00 +0000 (16:41 -0700)]
am
fdbac3da: (-s ours) am
5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Merge commit '
fdbac3da7f70871a0f62e593fc068844d1f7ae84'
* commit '
fdbac3da7f70871a0f62e593fc068844d1f7ae84':
DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Patrick Scott [Mon, 18 Oct 2010 21:46:49 +0000 (14:46 -0700)]
Merge "Fix books.google.com purchase page."
Patrick Scott [Mon, 18 Oct 2010 21:41:38 +0000 (17:41 -0400)]
Fix books.google.com purchase page.
We have to copy the data between threads.
Bug:
3105145
Change-Id: I955d033815aaf3fd18fdac52ab8cf9b23c107436
Steve Block [Mon, 18 Oct 2010 15:07:38 +0000 (16:07 +0100)]
Make sure the focus node is an HTMLInputElement before checking whether it's a password field
Bug:
3105611
Change-Id: I9190b50265d3b1ea9639dbdae1d513aefb93c9f3
Steve Block [Mon, 18 Oct 2010 17:40:42 +0000 (10:40 -0700)]
Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"
Shimeng (Simon) Wang [Mon, 18 Oct 2010 17:30:20 +0000 (10:30 -0700)]
Nicolas Roard [Mon, 18 Oct 2010 17:26:54 +0000 (10:26 -0700)]
am
3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Merge commit '
3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp
* commit '
3d57c253bfa22c17c5f38a70e162a6115a1809b6':
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Steve Block [Mon, 18 Oct 2010 15:44:18 +0000 (08:44 -0700)]
Merge "Add a file to record the LayoutTest directories in the Android tree"
Nicolas Roard [Tue, 2 Feb 2010 13:11:32 +0000 (13:11 +0000)]
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Cherry pick to Gingerbread, DO NOT MERGE!
Bug:
3101402
Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
Steve Block [Mon, 18 Oct 2010 10:30:33 +0000 (11:30 +0100)]
Add a file to record the LayoutTest directories in the Android tree
This is used when merging WebKit
Change-Id: Ie7fa9e85249331e28490bfbb640e4caf78f3ae1e
Ben Murdoch [Mon, 18 Oct 2010 10:09:02 +0000 (03:09 -0700)]
am
5013a3fb: DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Merge commit '
5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c' into gingerbread-plus-aosp
* commit '
5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c':
DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Ben Murdoch [Sun, 17 Oct 2010 15:33:00 +0000 (16:33 +0100)]
DO NOT MERGE Implement the document.createTouch, createTouchList APIs
Cherry pick to Gingerbread to enable HTML5 video playback on some
sites that look for certain APIs to determine player compatability.
Do not merge.
Bug:
3101402
Change-Id: Id54f4cbac23208249922c3ef44086c8d9828d32c
Shimeng (Simon) Wang [Sat, 16 Oct 2010 01:36:02 +0000 (18:36 -0700)]
Shimeng (Simon) Wang [Thu, 16 Sep 2010 22:03:07 +0000 (15:03 -0700)]
DO NOT MERGE
For cherry-picking to GB.
Implement supportsType in MediaPlayerPrivateAndroid.
Use Java API to obtain this info.
issue:
3101402
Change-Id: I2baaf8ad861bec9b9b6f92fe753cbd879b33497c
Jeff Brown [Fri, 15 Oct 2010 23:02:12 +0000 (16:02 -0700)]
Merge "Add new keycodes."
Nicolas Roard [Fri, 15 Oct 2010 22:17:00 +0000 (15:17 -0700)]
Fix potential deadlock when acquiring a texture
Change-Id: Ie24613c69fd048b14003f7cbc3ad0c86ba4e295e
Andrei Popescu [Fri, 15 Oct 2010 17:59:59 +0000 (10:59 -0700)]
Merge "Implement the document.createTouch and document.createTouchList APIs"
Ben Murdoch [Fri, 15 Oct 2010 16:12:52 +0000 (17:12 +0100)]
Implement the document.createTouch and document.createTouchList APIs
These are Apple extensions to the document object present on iOS
and are used by several sites to detect touch event support.
See
http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html
for Apple's documentation.
Upstreaming to webkit being tracked in
https://bugs.webkit.org/show_bug.cgi?id=47676
Bug:
2996106
Change-Id: I761b1494af60b5095ad9c47d54eb7240d47ae985
Steve Block [Fri, 15 Oct 2010 11:30:04 +0000 (12:30 +0100)]
Rename DeviceOrientationManager to DeviceMotionAndOrientationManager
Requires a corresponding change in frameworks/base ...
https://android-git.corp.google.com/g/74335
Change-Id: I8158a8a65e83fa1d0a80233250921dae2c2b4d76
Steve Block [Fri, 15 Oct 2010 12:59:34 +0000 (13:59 +0100)]
Fix a crash when deleting GraphicsContextPlatformPrivate
Make sure PlatformGraphicsContext::mCanvas is still around when we
call restore().
Bug:
3071206
Change-Id: I5b3bc40448e1d891a47f214d18daf345d55d9284
Steve Block [Thu, 14 Oct 2010 11:34:16 +0000 (12:34 +0100)]
Rename to_string() to jstringToWtfString() for greater clarity
Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4
Jeff Brown [Mon, 4 Oct 2010 19:42:02 +0000 (12:42 -0700)]
Add new keycodes.
Bug:
2912307
Change-Id: I8560879fa057af7a3193233db45506d1d4d419a0
Kenny Root [Fri, 15 Oct 2010 05:59:38 +0000 (22:59 -0700)]
resolved conflicts for merge of
1457b739 to master
Change-Id: I5e5460ec4afde9a229c3f73255f4d40322eb7166
Nicolas Roard [Thu, 14 Oct 2010 23:18:12 +0000 (16:18 -0700)]
Fix PictureSet update crash
Change-Id: I5fec3f1ce421831b3fecae4030d63a29fe75fa1c
Derek Sollenberger [Thu, 14 Oct 2010 20:02:09 +0000 (16:02 -0400)]
Cleanup TiledPage class.
The cleanup consists of:
1. renaming m_baseTextures to m_baseTiles
2. caching the inverse scale to speed up the draw calls
3. removing currentPictureMethod as it is available through GLWebViewState
4. adding comments to the public methods
5. some small source code optimizations
Change-Id: I831500da335a3afac7232524b74e63436ea65efb
Derek Sollenberger [Thu, 14 Oct 2010 19:19:40 +0000 (12:19 -0700)]
Merge "Cleanup the TileSet class."
Derek Sollenberger [Thu, 14 Oct 2010 15:27:43 +0000 (11:27 -0400)]
Cleanup the TileSet class.
The cleanup consisted of three pieces:
1. rename the class to TileSet since a set implies multiple tiles.
2. removed unused variables and uncessary methods.
3. cleaned up coding style and added comments.
Change-Id: I605fce367e4d1e8cb795f1e9bfab0ce0999dc7e3
Nicolas Roard [Thu, 14 Oct 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix crash bug when calling WebView::clearView()"
Nicolas Roard [Thu, 14 Oct 2010 18:32:00 +0000 (11:32 -0700)]
Fix crash bug when calling WebView::clearView()
Bug:
3097149
Change-Id: I280c0ca0e534d46570d758267c1e78c561a5b955
Ben Murdoch [Wed, 13 Oct 2010 15:50:47 +0000 (16:50 +0100)]
Support the complete AutoFill profile.
Load all AutoFill profile values from Java. Requires a
corresponding change in frameworks/base:
https://android-git.corp.google.com/g/#change,74046
Change-Id: I4567d0879f364647b649c0f3c80ce8e32423b371
Nicolas Roard [Mon, 4 Oct 2010 20:37:38 +0000 (13:37 -0700)]
GL rendering (without layers)
This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,64863
Change-Id: I40fcf3b7b6d28b887b101219c973070aeefbb777
Cary Clark [Wed, 13 Oct 2010 14:04:36 +0000 (07:04 -0700)]
am
e228a64d: Merge "Provide padding + border values for textfields." into gingerbread
Merge commit '
e228a64d32a6c1f9d88cf43529f69792207585dd' into gingerbread-plus-aosp
* commit '
e228a64d32a6c1f9d88cf43529f69792207585dd':
Provide padding + border values for textfields.
Cary Clark [Wed, 13 Oct 2010 13:57:15 +0000 (06:57 -0700)]
Merge "Provide padding + border values for textfields." into gingerbread
Ben Murdoch [Wed, 13 Oct 2010 11:47:15 +0000 (04:47 -0700)]
Merge "Sync autofill profile data from java."
Derek Sollenberger [Wed, 13 Oct 2010 11:36:04 +0000 (04:36 -0700)]
Merge "Remove unnecessary mutex locks from texture sharing code"
Steve Block [Wed, 13 Oct 2010 11:18:43 +0000 (04:18 -0700)]
Merge "Implement DeviceMotionEvent"
Ben Murdoch [Wed, 6 Oct 2010 13:34:04 +0000 (14:34 +0100)]
Sync autofill profile data from java.
Add the JNI bindings so that we can get the AutoFill profile data
that the user entered in the Browser UI and inject that data into
the WebAutoFill object. This eliminates the John Smith profile!
Note that additional profile data such as addresses and phone
numbers will be added very shortly.
Requires a corresponding change to frameworks/base,
see https://android-git.corp.google.com/g/#change,72204
Change-Id: Ie32100123ef0d868e1f7efb5604c6fac48725967
Leon Scroggins [Tue, 12 Oct 2010 18:01:13 +0000 (14:01 -0400)]
Provide padding + border values for textfields.
Bug:
3085564
They are used by WebView.java to align the WebTextView's
text positioning with the page below. This allows the
selection and insertion arrow handlers to line up better
with the actual selection on the page.
Requires a change in frameworks/base:
https://android-git.corp.google.com/g/#change,73565
Change-Id: Ia100286016a780abd5f30e32975f8ad566a6ed74
Derek Sollenberger [Tue, 12 Oct 2010 18:56:35 +0000 (14:56 -0400)]
Remove unnecessary mutex locks from texture sharing code
The DoubleBufferedTexture currently uses a mutex to protect access
to m_frontTexture on the producer functions. This mutex is not needed
in the producerLock/producerRelease functions as they will always be
called by the thread that sets m_frontTexture. Additionally, this
data will be initialized before calls to those funtions as the thread
must always call aquireContext() before calling these functions.
Change-Id: I110ad357c5eed4c0f5501761174e0da4b872af5d
http://b/
3089605
Cary Clark [Tue, 12 Oct 2010 18:51:16 +0000 (11:51 -0700)]
am
e0482608: am
5cff132a: change webkit text select to orange
Merge commit '
e0482608f9ee8684ac41fc225ec82ee33ae8e123'
* commit '
e0482608f9ee8684ac41fc225ec82ee33ae8e123':
change webkit text select to orange
Derek Sollenberger [Tue, 12 Oct 2010 17:31:25 +0000 (13:31 -0400)]
Add new API for plugin audio track latency.
This CL extends the existing udio API with a new function to
measure the latency of a audio track. To preserve binary
compatibility with the already released v0 API we have created
a v1 extension.
Change-Id: I656ac10470f2262bac7039aa45458d2100a37612
http://b/
3088633
Cary Clark [Tue, 12 Oct 2010 11:57:55 +0000 (04:57 -0700)]
Merge "check for columns before looking at column data"
Cary Clark [Mon, 11 Oct 2010 21:32:42 +0000 (17:32 -0400)]
check for columns before looking at column data
Also, fix some debug info to sync up with latest
webkit.
Change-Id: Iea8f019619b701fc2d3267228b9412379334b66e
http://b/
3074179
Cary Clark [Mon, 11 Oct 2010 19:56:57 +0000 (12:56 -0700)]
am
5cff132a: change webkit text select to orange
Merge commit '
5cff132af1e80304bdcb267bb9ee7201a25656ad' into gingerbread-plus-aosp
* commit '
5cff132af1e80304bdcb267bb9ee7201a25656ad':
change webkit text select to orange
Cary Clark [Mon, 11 Oct 2010 19:36:51 +0000 (15:36 -0400)]
change webkit text select to orange
This changes the selection to a transparent orange.
This won't match the UI exactly, because this draws
transparently over the text instead of opaquely
behind the text.
This also changes the design of the text selection
handles to match the bitmaps in the UI.
http://b/
3083069
Change-Id: I02656c42a3020f9b1e5dbc431c47bf2b51d22de8
Derek Sollenberger [Mon, 11 Oct 2010 18:51:24 +0000 (11:51 -0700)]
Merge "Fixed browser crash when plugins remove themselves from the DOM."
Derek Sollenberger [Mon, 11 Oct 2010 16:59:16 +0000 (12:59 -0400)]
Fixed browser crash when plugins remove themselves from the DOM.
If a plugin removes itself from the DOM and it is the only plugin
of that type on the page then the browser will attempt to unload
the plugin's shared library. This causes a problem since there is
plugin code still on the stack. The solution is to post a message
that removes the plugin's libary at a later time. This solution
was disabled in the past due to an unknown issue, but was tested
as working on both the Adobe plugin and a development sample plugin.
Change-Id: If60394336790f833d6b9333424836cbd32dc31e7
http://b/
3084460
Teng-Hui Zhu [Mon, 11 Oct 2010 16:17:24 +0000 (09:17 -0700)]
Merge "style cleanup on GraphicsContextAndroid.cpp"
Patrick Scott [Sun, 10 Oct 2010 19:48:47 +0000 (12:48 -0700)]
am
ffbc540c: (-s ours) am
3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
Merge commit '
ffbc540cfff9dfbd5909d7731c143f5d1181bbf1'
* commit '
ffbc540cfff9dfbd5909d7731c143f5d1181bbf1':
Revert to skia's decoder for gifs with 1 frame.
Teng-Hui Zhu [Tue, 5 Oct 2010 20:58:55 +0000 (13:58 -0700)]
style cleanup on GraphicsContextAndroid.cpp
Reduce the style check error from 118 to 1.
Mostly are one space for end of line comment, underscore in function
name, NULL Vs 0, comparing with 0 etc...
Only one function name android_gc2canvas still contain underscore and
chaning that need to touch multiple files.
That will be fixed when we come to clean up the whole directory.
Change-Id: Ibcbc4d368452943825a4b3421315732eb03c292c
http://b/
3003023
Ben Murdoch [Fri, 8 Oct 2010 15:00:21 +0000 (16:00 +0100)]
Fix WebCore/WebKit layering violation.
Move the call to WebViewCore::updateTextfield() to the PlatformBridge
so that WebCore code does not depend on WebKit code to compile.
In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.
Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b
Ben Murdoch [Fri, 8 Oct 2010 13:43:10 +0000 (14:43 +0100)]
Fix a WebCore/WebKit layering violation
Move the call to WebViewCore::updateViewport() from HTMLBodyElement
and HTMLMetaElement to the PlatformBridge so that WebCore code does
not depend on WebKit code to compile.
In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.
Change-Id: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb
Steve Block [Tue, 5 Oct 2010 13:28:30 +0000 (14:28 +0100)]
Implement DeviceMotionEvent
Requires a corresponding change in frameworks/base ...
https://android-git.corp.google.com/g/72907
Bug:
2495651
Change-Id: I8ba07a0280b96379b3717a707184d719da6266bf
Steve Block [Fri, 8 Oct 2010 14:50:41 +0000 (07:50 -0700)]
Merge "Prepare DeviceOrientationManager for implementation of DeviceMotion"
Steve Block [Fri, 8 Oct 2010 14:24:49 +0000 (15:24 +0100)]
Remove dependency of WebCore ScreenAndroid on platform API
Note that this change forks two WebCore files, but both files are
already forked and are unlikely to be changed upstream by non-Android
contributors. All changes to both files will be upstreamed at a later
date.
Bug:
2439218
Change-Id: I1e56ee12cec17df38a1404ab06c8897c22f2fd19
Patrick Scott [Thu, 7 Oct 2010 21:48:21 +0000 (14:48 -0700)]
am
3f8366e5: Revert to skia\'s decoder for gifs with 1 frame.
Merge commit '
3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65' into gingerbread-plus-aosp
* commit '
3f8366e53853027e7e11d4a40a1ad3f7a1ff5a65':
Revert to skia's decoder for gifs with 1 frame.
Leon Scroggins [Thu, 7 Oct 2010 20:13:31 +0000 (16:13 -0400)]
Revert "Prohibit scrolling not initiated by the user."
Bug:
3067265
This reverts commit
f116b073399a3c3f644d6e6aeb2521ef9d2c9e9b.
Conflicts:
WebCore/platform/android/PlatformBridge.h
WebKit/android/WebCoreSupport/PlatformBridge.cpp
Change-Id: I358ce936a8c6f99717b976cfa07e7fe26014760a
Patrick Scott [Thu, 7 Oct 2010 19:11:03 +0000 (15:11 -0400)]
Revert to skia's decoder for gifs with 1 frame.
If a site has a bunch of gifs, they will all be kept in memory. If the gif only
has one frame, revert to using skia's decoder so that we can share the memory
and use RLE encoding.
Bug:
3060919
Change-Id: I3091b184ce4a8c27a264473526ce4ea83a20e74f
Steve Block [Tue, 5 Oct 2010 12:09:08 +0000 (13:09 +0100)]
Prepare DeviceOrientationManager for implementation of DeviceMotion
To avoid additional boilerplate, this class will will be used for both
DeviceOrientation and DeviceMotion. This change does not involve any
change in behaviour, only renaming and adding stubs.
Change-Id: I0d6c9e1c2fc8d919ccbd048b068d898110707f0e
Kristian Monsen [Wed, 6 Oct 2010 18:57:35 +0000 (19:57 +0100)]
Merge WebKit at r68651 : Update WebKit revision and deps file
Change-Id: I48411abdd210ef9afd7363cdfb2a1cfa06d81820
Kristian Monsen [Wed, 6 Oct 2010 13:41:37 +0000 (14:41 +0100)]
Merge WebKit at r68651 : No prelinking after merge
WebKit has grown during the merge, and doesn't fit in the prelink map anymore
Reopened http://b/issue?id=
2917906 to track this
Change-Id: I40fb143a25a0637cd2c9359331576acb5a1c1fba
Kristian Monsen [Tue, 5 Oct 2010 20:51:00 +0000 (21:51 +0100)]
Merge WebKit at r68651 : Renamed variables
Changed m_minPrefWidth and m_maxPrefWidth to m_minPreferredLogicalWidth
and m_maxPreferredLogicalWidth in this CL:
http://trac.webkit.org/changeset/68276/trunk/WebCore/rendering/RenderBox.h
This changed containerWidth to containerLogicalWidth
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
Also changed calcReplacedWidthUsing to computeReplacedWidthUsing here:
http://trac.webkit.org/changeset/68239/trunk/WebCore/rendering/RenderBox.h
Change-Id: I8eb912128aa5e09f55f4495671209cb8ca2ba3f0
Kristian Monsen [Tue, 5 Oct 2010 20:26:05 +0000 (21:26 +0100)]
Merge WebKit at r68651 : Added WebCore::Page* parameter to didTransferChildFrameToNewDocument
Introduced in webkit CL:
http://trac.webkit.org/changeset/68576
Most platforms do not use the parameter in the first implementation.
Change-Id: I704b45af56bee85f277b737412549abcfeb90b08
Kristian Monsen [Tue, 5 Oct 2010 19:53:27 +0000 (20:53 +0100)]
Merge WebKit at r68651 : Default implementation for allowScriptExtension
Just added a default implementation that always return true.
http://trac.webkit.org/changeset/68061
Change-Id: I0f740ac32369580953b2fdbe071316521b9b2382
Kristian Monsen [Tue, 5 Oct 2010 19:23:04 +0000 (20:23 +0100)]
Merge WebKit at r68651 : Use the Android version of release/retainPlatformWidget
Empty declarations for these were added in the header file, probably safest
to keep the Android ones around.
In the Fix conflicts merge these were removed from Widget.cpp, so this should
match the old behaviour.
Webkit CL:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.h
Change-Id: Ifdc0ad47816e03a7d424eb7130f2f7c1a61f7067
Steve Block [Tue, 5 Oct 2010 14:00:26 +0000 (15:00 +0100)]
Merge WebKit at r68651 : Implement controller destroyed callbacks for DeviceOrientation and DeviceMotion
See http://trac.webkit.org/changeset/67949
Change-Id: Ide94a861a7468d4eef3a238696aad754c8924aed
Kristian Monsen [Mon, 4 Oct 2010 16:29:31 +0000 (17:29 +0100)]
Merge WebKit at r68651 : Compile fix, add missing include
Fix in a later revision of Webkit, this is a cherry-pick:
http://trac.webkit.org/changeset/68780/trunk/WebCore/loader/PingLoader.cpp
Change-Id: I95ecfd0de7ef494fbf0eb7413976e326b525a026
Kristian Monsen [Mon, 4 Oct 2010 16:11:14 +0000 (17:11 +0100)]
Merge WebKit at r68651 : Add ANDROID guards
m_axObjectCache is not used for Android, so adding guards like in
similar functions.
Change-Id: I6179bb23fce275095b9521680282eb4ba8b3d29e
Kristian Monsen [Mon, 4 Oct 2010 15:54:35 +0000 (16:54 +0100)]
Merge Webkit at r68651 : Add guards for ENABLED(INSPECTOR)
This has been fixed upstream in this CL (which this is a cherrry-pick of):
http://trac.webkit.org/changeset/68763/trunk/WebCore/inspector/InspectorController.h
And later removed upstream in this CL:
http://trac.webkit.org/changeset/68767/trunk/WebCore/inspector/InspectorController.h
Change-Id: I4c724f2f52a5a9db6dca6b58032b6a902aac74b5
Kristian Monsen [Thu, 30 Sep 2010 14:42:16 +0000 (15:42 +0100)]
Merge Webkit at r68651 : Fix conflicts.
ChromeClient.h:
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
http://trac.webkit.org/changeset/68031/trunk/WebCore/page/ChromeClient.h
CSSParser.cpp:
Conflict due to ANDROID_INSTRUMENT
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/CSSParser.cpp
Node.cpp:
Conflict due to ANDROID_DOM_LOGGING
http://trac.webkit.org/changeset/68541/trunk/WebCore/dom/Node.cpp
npapi.h:
Conflicts due to various #ifdef ANDROID
http://trac.webkit.org/changeset/68390/trunk/WebCore/bridge/npapi.h
PlatformTouchEvent.h:
PlatformTouchEventAndroid.cpp:
PlatformTouchPoint.h:
Conflicts due to new BREWMP code next to changed Android code
Initial webkit CL:
http://trac.webkit.org/changeset/68499
Later fix after merge revision, so cherry-picked:
http://trac.webkit.org/changeset/69034
RenderBox.cpp:
Several changes, conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68238#file2
http://trac.webkit.org/changeset/68239#file3
http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp
The correct resolution here is unclear. A closer investiagtion by somebdoy
more familiar with the code is tracked with b/
3071198
RenderBox.h:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68417/trunk/WebCore/rendering/RenderBox.h
RenderIFrame.cpp:
Conflicts due to ANDROID_FLATTEN_IFRAME
http://trac.webkit.org/changeset/68238/trunk/WebCore/rendering/RenderIFrame.cpp
RenderTable.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68427/trunk/WebCore/rendering/RenderTable.cpp
RenderView.cpp:
Conflicts due to ANDROID_LAYOUT
http://trac.webkit.org/changeset/68436/trunk/WebCore/rendering/RenderView.cpp
Settings.cpp:
Settings.h:
Conflicts due to ANDROID_PLUGINS and WEB_AUTOFILL
http://trac.webkit.org/changeset/68166
Widget.cpp:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.cpp
Change-Id: I156f537ae0483b89e4c6b9fce0e7b2f931f957a2
Kristian Monsen [Thu, 30 Sep 2010 16:25:16 +0000 (17:25 +0100)]
Merge Webkit at r68651 : Fix Makefiles.
Two perl scripts now generate .cpp files as well as .h files:
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/makevalues.pl
http://trac.webkit.org/changeset/65942/trunk/WebCore/css/makeprop.pl
Change-Id: Ic820536494d259200a69e07711d8cf19d5654b31
Kristian Monsen [Thu, 30 Sep 2010 14:42:16 +0000 (15:42 +0100)]
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Shimeng (Simon) Wang [Thu, 16 Sep 2010 22:03:07 +0000 (15:03 -0700)]
Implement supportsType in MediaPlayerPrivateAndroid.
Use Java API to obtain this info.
issue:
2816278
Change-Id: Ia525cc84f9a18ad2f9868d9f13d3671da527e5e0
Steve Block [Mon, 4 Oct 2010 16:11:19 +0000 (17:11 +0100)]
Hook up WebView.clearCache() for the Chromium HTTP stack
Bug:
2999397
Change-Id: If104a32fa2fd56cf60fdd37a4193a0ec4e0065e2
Steve Block [Wed, 6 Oct 2010 15:07:49 +0000 (08:07 -0700)]
Merge "Fix a compiler warning"
Steve Block [Tue, 5 Oct 2010 12:05:26 +0000 (13:05 +0100)]
Fix a compiler warning
Change-Id: Iccf9b5bf8f39491b737e6d7e4e82237a4874c6d7
Kristian Monsen [Tue, 5 Oct 2010 15:59:28 +0000 (08:59 -0700)]
Merge changes I27224716,I6102bbce
* changes:
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
Generate files correctly
Kristian Monsen [Tue, 5 Oct 2010 12:18:43 +0000 (13:18 +0100)]
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
This is a cherry-pick of the following upstream CL:
https://bugs.webkit.org/show_bug.cgi?id=47179
This violates the rules at the top of the file, and means that it
will be included before any other includes for all compilation
units.
We are now just including JavaScriptCore/config.h from
WebCore/config.h so if you include one you get both.
This created a compile error in V8Counters.cpp, which is also fixed
Change-Id: I272247161877ddc680b3aab509bc413ab3445219
Kristian Monsen [Tue, 5 Oct 2010 12:15:29 +0000 (13:15 +0100)]
Generate files correctly
Instead of creating them at . and moving to the right place, just
create them at the right place. This way any additional files
created will be in the right place as well.
Change-Id: I6102bbcee2b4bec3f780fdbed20ba15c9d1a6017
Patrick Scott [Tue, 5 Oct 2010 14:05:31 +0000 (07:05 -0700)]
Merge "Block network loads based on the setting."
Patrick Scott [Tue, 5 Oct 2010 13:32:44 +0000 (09:32 -0400)]
Block network loads based on the setting.
Bug:
3053149
Change-Id: Idb6850b2aac5de2ab19850779a65496ef356961d
Leon Scroggins III [Tue, 5 Oct 2010 13:43:54 +0000 (06:43 -0700)]
Merge "When a page fails to load, notify that the page is finished"
Huahui Wu [Mon, 4 Oct 2010 22:23:22 +0000 (15:23 -0700)]
b/
3039749 resolving the conflicts for WebKit.
Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5
Teng-Hui Zhu [Thu, 30 Sep 2010 22:32:21 +0000 (15:32 -0700)]
Add AA to the border radius
In order to enable AA for the border radius, add an extra layer for drawing and then clearing by using AA paint. The reason why clipping can't show AA is that it is 1-bit clip.
Change-Id: Ic9fa99915fb908e502dcb90cfe1428bb4d8e136b
http://b/
3003023
Leon Scroggins III [Mon, 4 Oct 2010 15:34:43 +0000 (11:34 -0400)]
When a page fails to load, notify that the page is finished
Bug:
2974418
Change-Id: I55f8ee1c235004da9ea6bed13af0758f10b715a8
Leon Scroggins III [Mon, 4 Oct 2010 14:47:16 +0000 (07:47 -0700)]
Merge "Use SelectionController to determine whether to open IME."
Steve Block [Mon, 4 Oct 2010 11:35:49 +0000 (04:35 -0700)]
Merge "Add failing test expectations for DumpRenderTree2 for tests which rely on being served from file://"
Leon Scroggins III [Fri, 1 Oct 2010 22:30:49 +0000 (18:30 -0400)]
Use SelectionController to determine whether to open IME.
Bug:
2863136
Previously we were checking the focused Node, which does
not always tell properly whether the current selection is
in a contentEditable location. Check the
SelectionController instead, which seems to be more
accurate.
Change-Id: Ibb64ad13275470da722529891f85f9dc347f9e8d
Patrick Scott [Fri, 1 Oct 2010 18:39:33 +0000 (11:39 -0700)]
Merge "Build fix for the simulator."
Patrick Scott [Fri, 1 Oct 2010 17:33:40 +0000 (13:33 -0400)]
Build fix for the simulator.
Change-Id: Id6d2fa0d5b9ee9641466ee119ced28cfcda2f8ca
claireho [Fri, 1 Oct 2010 16:04:54 +0000 (09:04 -0700)]
Merge "Bug2811469 - wide space in RTL layout"
Cary Clark [Fri, 1 Oct 2010 14:03:37 +0000 (07:03 -0700)]
am
8dd042ec: (-s ours) am
8180f816: Do not merge: fix array overwrite crasher
Merge commit '
8dd042ec5ff3a28fd7e0291b0b092a98306229f7'
* commit '
8dd042ec5ff3a28fd7e0291b0b092a98306229f7':
Do not merge: fix array overwrite crasher
Cary Clark [Fri, 1 Oct 2010 13:57:35 +0000 (06:57 -0700)]
am
8180f816: Do not merge: fix array overwrite crasher
Merge commit '
8180f8161470f2d0d6080c64149cf25ed3b755a5' into gingerbread-plus-aosp
* commit '
8180f8161470f2d0d6080c64149cf25ed3b755a5':
Do not merge: fix array overwrite crasher
Steve Block [Thu, 30 Sep 2010 11:10:26 +0000 (12:10 +0100)]
Update AndroidURLRequestContextGetter to take a pointer to the getter function
This allows users of AndroidURLRequestContextGetter to instantiate a
URLRequestContext lazilly.
When used in AutoFill++, this means that when the URLRequestContext is
first initialized, the WebCore thread is set-up and the necessary
settings are available.
Also re-enables AutoFill++
The corresponding external/chromium change is
https://android-git.corp.google.com/g/71275
Bug:
3044989
Change-Id: I4b577f08717775bce5268f3f4b4f5fcf23e54536
Steve Block [Thu, 30 Sep 2010 10:53:33 +0000 (11:53 +0100)]
Update WebRequestContext static getters to return pointers to the base class
This allows us to use these static getters with Chromium APIs which
can use only the Chromium base class, not the Android derived class.
Change-Id: I9690ef00a775cff2b580ae5c0c745d7b24021a4c
Cary Clark [Thu, 30 Sep 2010 19:14:40 +0000 (15:14 -0400)]
Do not merge: fix array overwrite crasher
If two nodes have the same coordinates, one is deleted.
If either has focus, the focus needs to be transfered
to the other, and the focus index recomputed, so the
index won't point to the wrong node.
If the two nodes are at the end of the list, the
index may point off the end of the array, subsequently
crashing on access.
This is a possible security issue.
Change-Id: I1ca934074637fbf68e40318fbc354e28c6b474ba
http://b/
3043268
Shimeng (Simon) Wang [Wed, 29 Sep 2010 19:22:10 +0000 (12:22 -0700)]
Fix the compiler error while disabling overflow scroll.
Change-Id: I4d74ac00a6d348ce00b551572da6ceb5f2793b1f
Kristian Monsen [Thu, 30 Sep 2010 11:23:08 +0000 (12:23 +0100)]
Prelink libwebcore.so, fix for b
2917906
After switching to thumb mode for external/chromium, libwebcore.so now fits in the reserved
space in the prelink map. Enabling prelinking with the Chrome HTTP stack.
Change-Id: I69a798a66a32ab3efb46e8728a3e276877c328e0
Kristian Monsen [Wed, 29 Sep 2010 20:20:19 +0000 (21:20 +0100)]
JSC build fix
Need by this webkit CL:
http://trac.webkit.org/changeset/67898
Change-Id: Ic6180c845bf2d51036925e9329be6cb9a0cc0ab6