OSDN Git Service
Ben Murdoch [Thu, 12 Nov 2009 01:10:29 +0000 (17:10 -0800)]
am
46c1ee20: Merge change I42d5994d into eclair-mr2
Merge commit '
46c1ee2072ee97ac3f59e265676f03e2229a4ad1'
* commit '
46c1ee2072ee97ac3f59e265676f03e2229a4ad1':
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
Android (Google) Code Review [Thu, 12 Nov 2009 01:00:40 +0000 (17:00 -0800)]
Merge change I42d5994d into eclair-mr2
* changes:
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
Ben Murdoch [Wed, 11 Nov 2009 23:32:22 +0000 (15:32 -0800)]
am
87ddfee6: Merge change I7b6fdc2d into eclair-mr2
Merge commit '
87ddfee675a35a132cad188268a46f96ca9d479e'
* commit '
87ddfee675a35a132cad188268a46f96ca9d479e':
Fix a diff between our tree and the upstream WX port.
Android (Google) Code Review [Wed, 11 Nov 2009 23:24:06 +0000 (15:24 -0800)]
Merge change I7b6fdc2d into eclair-mr2
* changes:
Fix a diff between our tree and the upstream WX port.
Ben Murdoch [Wed, 11 Nov 2009 23:09:18 +0000 (15:09 -0800)]
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
This change needs to be upstreamed.
Change-Id: I42d5994dc975206cbb376189613dc23426a4a9a8
Ben Murdoch [Wed, 11 Nov 2009 23:06:47 +0000 (15:06 -0800)]
Fix a diff between our tree and the upstream WX port.
Change-Id: I7b6fdc2d1b00768f10f18520a11d20f267c42de3
Steve Block [Wed, 11 Nov 2009 22:57:03 +0000 (14:57 -0800)]
am
61e871fe: Removes extra define of HAVE_PTHREAD_RW_LOCK.
Merge commit '
61e871fe7ec093f258fee3cd3b304592f5d6c2f7'
* commit '
61e871fe7ec093f258fee3cd3b304592f5d6c2f7':
Removes extra define of HAVE_PTHREAD_RW_LOCK.
Steve Block [Wed, 11 Nov 2009 22:56:59 +0000 (14:56 -0800)]
am
ba51ea61: Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Merge commit '
ba51ea61f184429a046b2a212fcc905083a360fe'
* commit '
ba51ea61f184429a046b2a212fcc905083a360fe':
Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Steve Block [Wed, 11 Nov 2009 00:05:54 +0000 (00:05 +0000)]
Removes extra define of HAVE_PTHREAD_RW_LOCK.
This define was added to Android and later upstreamed to webkit.org at a slightly different location.
The latest WebKit merge caused both defines to be used.
See https://bugs.webkit.org/show_bug.cgi?id=30713
Change-Id: Ib68ceddb57868903661a1d2e3fedf9e092222091
Steve Block [Fri, 6 Nov 2009 21:08:07 +0000 (21:08 +0000)]
Removes LOCK_V8 calls, which are incomplete having been abandonned prior to previous WebKit merges.
Change-Id: Iee5a3a8d4eb1087ef196f193efb93d1e0dbcf77b
Steve Block [Wed, 11 Nov 2009 00:24:28 +0000 (16:24 -0800)]
am
2c386559: Update Android build to remove websockets include and to keep in line with latest WebKit.
Merge commit '
2c386559c2b67b9921be326a44676937b61b08f4'
* commit '
2c386559c2b67b9921be326a44676937b61b08f4':
Update Android build to remove websockets include and to keep in line with latest WebKit.
Steve Block [Fri, 6 Nov 2009 08:36:18 +0000 (08:36 +0000)]
Update Android build to remove websockets include and to keep in line with latest WebKit.
See https://bugs.webkit.org/show_bug.cgi?id=31209
Change-Id: Ie79b5599ee9d6a87f02eea7148f2660b0aaafd9d
Steve Block [Tue, 10 Nov 2009 23:24:40 +0000 (15:24 -0800)]
am
70c8e1be: Merge webkit.org at r50258 : Update WebKit revision number.
Merge commit '
70c8e1be70c9509280aa52daa293153cb033df13'
* commit '
70c8e1be70c9509280aa52daa293153cb033df13':
Merge webkit.org at r50258 : Update WebKit revision number.
Steve Block [Tue, 10 Nov 2009 23:24:34 +0000 (15:24 -0800)]
am
20626c19: Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
Merge commit '
20626c197f988d4bae39e99e4699173602b0aaaa'
* commit '
20626c197f988d4bae39e99e4699173602b0aaaa':
Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
Steve Block [Tue, 10 Nov 2009 23:24:26 +0000 (15:24 -0800)]
am
9fe74483: Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
Merge commit '
9fe744833c6f1531bc730abafe6d35fc5c9d653d'
* commit '
9fe744833c6f1531bc730abafe6d35fc5c9d653d':
Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
Steve Block [Tue, 10 Nov 2009 23:24:21 +0000 (15:24 -0800)]
am
7e782692: Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
Merge commit '
7e78269225e9e9cee2d8ba12488fb907c2c1db59'
* commit '
7e78269225e9e9cee2d8ba12488fb907c2c1db59':
Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
Steve Block [Tue, 10 Nov 2009 23:24:16 +0000 (15:24 -0800)]
am
c05f32f6: Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
Merge commit '
c05f32f6ac83a4d9467153745a217b636e8c8a60'
* commit '
c05f32f6ac83a4d9467153745a217b636e8c8a60':
Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
Steve Block [Tue, 10 Nov 2009 23:24:10 +0000 (15:24 -0800)]
am
5995cab4: Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
Merge commit '
5995cab44737fd5374956941260caf2e2e8290b3'
* commit '
5995cab44737fd5374956941260caf2e2e8290b3':
Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
Steve Block [Tue, 10 Nov 2009 23:24:04 +0000 (15:24 -0800)]
am
67ed0ede: Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
Merge commit '
67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a'
* commit '
67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a':
Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
Steve Block [Tue, 10 Nov 2009 23:23:57 +0000 (15:23 -0800)]
am
5fa903cc: Merge webkit.org at r50258 : Fix header include order for Log.h.
Merge commit '
5fa903cc3950d366e347a4495de32a0a397b1d47'
* commit '
5fa903cc3950d366e347a4495de32a0a397b1d47':
Merge webkit.org at r50258 : Fix header include order for Log.h.
Steve Block [Tue, 10 Nov 2009 23:23:50 +0000 (15:23 -0800)]
am
8a2d94ee: Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().
Merge commit '
8a2d94ee2b678e40f2c6874fda176178863ee107'
* commit '
8a2d94ee2b678e40f2c6874fda176178863ee107':
Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().
Steve Block [Tue, 10 Nov 2009 23:23:43 +0000 (15:23 -0800)]
am
b2e37e91: Merge webkit.org at r50258 : Fix Makefiles.
Merge commit '
b2e37e910dfa6b85db496d6d8107ccbee539a3c8'
* commit '
b2e37e910dfa6b85db496d6d8107ccbee539a3c8':
Merge webkit.org at r50258 : Fix Makefiles.
Steve Block [Tue, 10 Nov 2009 23:23:35 +0000 (15:23 -0800)]
am
3f60c26c: Merge webkit.org at r50258 : Fix conflicts.
Merge commit '
3f60c26c3fa9dc89d57ef4db083a4f13ef86c103'
* commit '
3f60c26c3fa9dc89d57ef4db083a4f13ef86c103':
Merge webkit.org at r50258 : Fix conflicts.
Steve Block [Tue, 10 Nov 2009 23:23:25 +0000 (15:23 -0800)]
am
cac0f67c: Merge webkit.org at r50258 : Initial merge by git.
Merge commit '
cac0f67c402d107cdb10971b95719e2ff9c7c76b'
* commit '
cac0f67c402d107cdb10971b95719e2ff9c7c76b':
Merge webkit.org at r50258 : Initial merge by git.
Steve Block [Thu, 5 Nov 2009 18:44:14 +0000 (18:44 +0000)]
Merge webkit.org at r50258 : Update WebKit revision number.
Change-Id: If63324be97f04e715aa12b278a1c46d8845690f4
Steve Block [Thu, 29 Oct 2009 16:35:41 +0000 (16:35 +0000)]
Merge webkit.org at r50258 : toJSDOMWindow now takes a DOMWrapperWorld parameter.
See http://trac.webkit.org/changeset/49963 and http://trac.webkit.org/changeset/49978
Change-Id: Ic788827d54ccf48a3eb54863d2708ebad1d67ae1
Steve Block [Thu, 29 Oct 2009 12:12:32 +0000 (12:12 +0000)]
Merge webkit.org at r50258 : PluginPackage::compareFileVersion is now provided in PluginPackage.cpp.
See http://trac.webkit.org/changeset/50138
Change-Id: Ifbb9bbf4fab660148e4e9afe1bedcda0e1b40058
Steve Block [Tue, 20 Oct 2009 15:28:30 +0000 (16:28 +0100)]
Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
See http://trac.webkit.org/changeset/49641
Change-Id: I8b1a274623a62f73563988eb1ed120f43e0e4c70
Steve Block [Tue, 20 Oct 2009 14:51:43 +0000 (15:51 +0100)]
Merge webkit.org at r50258 : FrameLoader::loadFrameRequest now takes a ReferrerPolicy parameter.
See http://trac.webkit.org/changeset/49809
Change-Id: I5db6d1d821cc6e7b57dfa665ea9018b4833864d5
Steve Block [Tue, 20 Oct 2009 14:57:41 +0000 (15:57 +0100)]
Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
See http://trac.webkit.org/changeset/49372
Change-Id: Iecc49a2185681eb2f37b5ecc9364fa8946493f69
Steve Block [Tue, 20 Oct 2009 14:07:10 +0000 (15:07 +0100)]
Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
See http://trac.webkit.org/changeset/49413
Change-Id: I1e584a6a50e1a20e40c76471651c0561df496c47
Steve Block [Thu, 29 Oct 2009 11:22:43 +0000 (11:22 +0000)]
Merge webkit.org at r50258 : Fix header include order for Log.h.
See http://trac.webkit.org/changeset/50006
Change-Id: I3a347d8d027edeebb9732b2736506a1bd2d24b56
Steve Block [Thu, 29 Oct 2009 10:58:27 +0000 (10:58 +0000)]
Merge webkit.org at r50258 : Add guards for Document::inspectorTimelineAgent().
See http://trac.webkit.org/changeset/50068
Change-Id: Ib330cd0a5bb53f262236b38cd0fb771fd7b7d4dc
Steve Block [Thu, 29 Oct 2009 00:55:04 +0000 (00:55 +0000)]
Merge webkit.org at r50258 : Fix Makefiles.
Change-Id: I5b458ac956718d2dd25d4faff503b376cd9e3214
Steve Block [Thu, 5 Nov 2009 18:34:51 +0000 (18:34 +0000)]
Merge webkit.org at r50258 : Fix conflicts.
Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608
Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
Steve Block [Thu, 5 Nov 2009 09:23:40 +0000 (09:23 +0000)]
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Cary Clark [Tue, 10 Nov 2009 20:39:43 +0000 (12:39 -0800)]
am
4b2ef0f2: Merge change I3a493eb3 into eclair-mr2
Merge commit '
4b2ef0f288e7c6c4602f621b7a0e9feed304b70e'
* commit '
4b2ef0f288e7c6c4602f621b7a0e9feed304b70e':
capture offscreen invalidates in webkit
Android (Google) Code Review [Tue, 10 Nov 2009 20:31:44 +0000 (12:31 -0800)]
Merge change I3a493eb3 into eclair-mr2
* changes:
capture offscreen invalidates in webkit
Cary Clark [Mon, 9 Nov 2009 17:12:40 +0000 (12:12 -0500)]
capture offscreen invalidates in webkit
The latest update of webkit changed the way drawing invalidates
are captured. ScrollView::repaintContentRectangle now includes
an intersect test that short-circuits if rect to repaint is
outside the visible content.
FrameView::repaintContentRectangle had logic to capture offscreen
drawing, but only if the repaint rect was entirely clipped out.
This changes both FrameView and ScrollView to send partial
repaints to the offscreen code, up to four rects per draw.
fixes http://b/issue?id=
2207086
Mike Reed [Tue, 10 Nov 2009 16:36:09 +0000 (08:36 -0800)]
am
af125549: Merge change I888150fd into eclair-mr2
Merge commit '
af1255496788b347a21a5db0e63c011c992c83b8'
* commit '
af1255496788b347a21a5db0e63c011c992c83b8':
up our max ram value before subsampling in the decoder
Android (Google) Code Review [Tue, 10 Nov 2009 16:28:39 +0000 (08:28 -0800)]
Merge change I888150fd into eclair-mr2
* changes:
up our max ram value before subsampling in the decoder
Steve Block [Tue, 10 Nov 2009 02:08:24 +0000 (18:08 -0800)]
am
472f92f6: (-s ours) am
f3df4438: (-s ours) Merge change I43c19e84 into eclair
Merge commit '
472f92f6354c0482276d23b91d7679b2ea65652d'
* commit '
472f92f6354c0482276d23b91d7679b2ea65652d':
Stop Geolocation service when browser tab is in the background. Do not merge.
Steve Block [Tue, 10 Nov 2009 01:59:24 +0000 (17:59 -0800)]
am
f3df4438: (-s ours) Merge change I43c19e84 into eclair
Merge commit '
f3df443854d9a26a47c5f48c60b552d9d3c7efdd' into eclair-mr2
* commit '
f3df443854d9a26a47c5f48c60b552d9d3c7efdd':
Stop Geolocation service when browser tab is in the background. Do not merge.
Android (Google) Code Review [Tue, 10 Nov 2009 01:56:54 +0000 (17:56 -0800)]
Merge change I43c19e84 into eclair
* changes:
Stop Geolocation service when browser tab is in the background. Do not merge.
Leon Scroggins [Tue, 10 Nov 2009 00:33:34 +0000 (16:33 -0800)]
am
37b29128: (-s ours) am
6f9b8a17: (-s ours) do not merge -- Fix a clicking bug.
Merge commit '
37b291282314f7cea53daf6e161d3e34c734381e'
* commit '
37b291282314f7cea53daf6e161d3e34c734381e':
do not merge -- Fix a clicking bug.
Leon Scroggins [Tue, 10 Nov 2009 00:17:16 +0000 (16:17 -0800)]
am
6f9b8a17: (-s ours) do not merge -- Fix a clicking bug.
Merge commit '
6f9b8a1745fc174f1c436237dde772fca8e47f06' into eclair-mr2
* commit '
6f9b8a1745fc174f1c436237dde772fca8e47f06':
do not merge -- Fix a clicking bug.
Steve Block [Sun, 8 Nov 2009 07:56:39 +0000 (07:56 +0000)]
Stop Geolocation service when browser tab is in the background. Do not merge.
This is a fix for bug http://b/issue?id=
2211437
This has already been submitted to Eclair MR2 branch.
Change-Id: I43c19e84fda6291590ff2f07bbadb18a4f86df5f
Derek Sollenberger [Mon, 9 Nov 2009 22:00:23 +0000 (17:00 -0500)]
resolved conflicts for merge of
1f303dad to master
Grace Kloba [Mon, 9 Nov 2009 21:44:38 +0000 (13:44 -0800)]
resolved conflicts for merge of
ef7b176b to master
Android (Google) Code Review [Mon, 9 Nov 2009 20:42:50 +0000 (12:42 -0800)]
Merge change I5bad623b into eclair-mr2
* changes:
Allow plugins to load java classes from their apk.
Derek Sollenberger [Mon, 9 Nov 2009 19:41:06 +0000 (14:41 -0500)]
Allow plugins to load java classes from their apk.
Relocate ANPSystemInterface into its own file and provide the
ability to call into java and load a plugin's java class from
their apk.
see http://b/
2215696
Leon Scroggins [Wed, 28 Oct 2009 18:25:19 +0000 (14:25 -0400)]
do not merge -- Fix a clicking bug.
original at https://android-git.corp.google.com/g/#change,31300
Remove some code that simulates a mouse click at the beginning of
a textarea and the end of a textfield. The original goal was to
make the click change the selection to be at the beginning or end
of the field, respectively. However, we actually make another call
which prevents this click from the selection. Further, the
selection actually gets changed elsewhere.
Fixes http://b/issue?id=
2219233
Grace Kloba [Mon, 9 Nov 2009 02:45:44 +0000 (18:45 -0800)]
Add/expose postdata identifier so that when we cache
the post data, we can distinguish them.
add identifier to postUrl().
add identifier when we check whether the post data
can be loaded from cache.
Fix http://b/issue?id=
1980031
Mike Reed [Fri, 6 Nov 2009 19:14:26 +0000 (14:14 -0500)]
up our max ram value before subsampling in the decoder
http://b/issue?id=
2236822
todo: find a system-wide compile-flag to trigger off of
Leon Scroggins [Fri, 6 Nov 2009 19:15:20 +0000 (11:15 -0800)]
am
de2098fb: Store the Node\'s text rather than the renderer\'s text.
Merge commit '
de2098fbe71502df93eb3228ceaabd698aef0542'
* commit '
de2098fbe71502df93eb3228ceaabd698aef0542':
Store the Node's text rather than the renderer's text.
Leon Scroggins [Fri, 6 Nov 2009 18:27:13 +0000 (13:27 -0500)]
Store the Node's text rather than the renderer's text.
The renderer may be displaying a placeholder (attribute on HTMLInputElement
and HTMLTextAreaElement), which will be deleted when the field gains
focus, so take the text directly from the node instead.
Fixes http://b/issue?id=
2163427
Steve Block [Thu, 5 Nov 2009 08:39:05 +0000 (00:39 -0800)]
am
7b1ba95f: Fixes V8 build due to missing include.
Merge commit '
7b1ba95f7d592009a5674bbc38e3af9ee83a796a'
* commit '
7b1ba95f7d592009a5674bbc38e3af9ee83a796a':
Fixes V8 build due to missing include.
Steve Block [Thu, 5 Nov 2009 07:45:26 +0000 (07:45 +0000)]
Fixes V8 build due to missing include.
Change-Id: I2a2b04cb7e9e8b109d065478540db351064f2c09
Steve Block [Thu, 5 Nov 2009 07:38:03 +0000 (23:38 -0800)]
am
92c524cf: Merge change I9ef85bb1 into eclair-mr2
Merge commit '
92c524cfcfd95ac54d54b3c317f5a80bd8f53f3d'
* commit '
92c524cfcfd95ac54d54b3c317f5a80bd8f53f3d':
Move V8 to external/v8
Android (Google) Code Review [Thu, 5 Nov 2009 07:23:06 +0000 (02:23 -0500)]
Merge change I9ef85bb1 into eclair-mr2
* changes:
Move V8 to external/v8
Steve Block [Thu, 5 Nov 2009 07:04:41 +0000 (23:04 -0800)]
am
b999b2f5: Stop Geolocation service when browser tab is in the background.
Merge commit '
b999b2f567121b11fe014341931a72a5a7a6f4b4'
* commit '
b999b2f567121b11fe014341931a72a5a7a6f4b4':
Stop Geolocation service when browser tab is in the background.
Steve Block [Wed, 28 Oct 2009 11:29:58 +0000 (11:29 +0000)]
Stop Geolocation service when browser tab is in the background.
This is a fix for bug http://b/issue?id=
2211437
Change-Id: Id44b5b5679a302ecb16d5f493ea900d252faf2dc
Steve Block [Fri, 30 Oct 2009 11:49:59 +0000 (11:49 +0000)]
Move V8 to external/v8
Change-Id: I9ef85bb1a4fd0e808ca37ac532803542b6dfb04d
Steve Block [Fri, 30 Oct 2009 15:24:00 +0000 (08:24 -0700)]
am
2675a5cf: (-s ours) am
b9fca1a7: (-s ours) Fix Geolocation service to use correct signature for Location.getAltitude(). Do not merge.
Merge commit '
2675a5cf2dfbe6a2b08e57bd2e7594c68e8025a2'
* commit '
2675a5cf2dfbe6a2b08e57bd2e7594c68e8025a2':
Fix Geolocation service to use correct signature for Location.getAltitude(). Do not merge.
Grace Kloba [Fri, 30 Oct 2009 15:23:54 +0000 (08:23 -0700)]
am
1e9e2ea3: am
5469794f: Avoid constructing the MutexLocker class to avoid two mystery crashes.
Merge commit '
1e9e2ea3ae5ef732b6cb90aa16f94b43cbde5f21'
* commit '
1e9e2ea3ae5ef732b6cb90aa16f94b43cbde5f21':
Avoid constructing the MutexLocker class to avoid
Steve Block [Fri, 30 Oct 2009 15:03:21 +0000 (08:03 -0700)]
am
b9fca1a7: (-s ours) Fix Geolocation service to use correct signature for Location.getAltitude(). Do not merge.
Merge commit '
b9fca1a768e8d5f3948b492fb962210af28d8d23' into eclair-mr2
* commit '
b9fca1a768e8d5f3948b492fb962210af28d8d23':
Fix Geolocation service to use correct signature for Location.getAltitude(). Do not merge.
Grace Kloba [Fri, 30 Oct 2009 15:03:12 +0000 (08:03 -0700)]
am
5469794f: Avoid constructing the MutexLocker class to avoid two mystery crashes.
Merge commit '
5469794fd9ad86cd03ba4cf7ef0bc82329362f39' into eclair-mr2
* commit '
5469794fd9ad86cd03ba4cf7ef0bc82329362f39':
Avoid constructing the MutexLocker class to avoid
Steve Block [Thu, 29 Oct 2009 22:08:59 +0000 (22:08 +0000)]
Fix Geolocation service to use correct signature for Location.getAltitude(). Do not merge.
This is a fix for bug http://b/issue?id=
2221243
This has already been submitted to Eclair MR2 branch.
Change-Id: I964e004583cebe4c93fe3e9c1c7d5ef44a41d1f8
Leon Scroggins [Thu, 29 Oct 2009 13:47:34 +0000 (09:47 -0400)]
Send a message when the page changes and find is up to search again.
Fixes http://b/issue?id=
2222706
Requires a change in frameworks/base.
Cherry pick a change from mr2, with a slight change to JNI handling.
Steve Block [Thu, 29 Oct 2009 17:33:37 +0000 (10:33 -0700)]
am
84191aa5: Merge change Id5b57453 into eclair-mr2
Merge commit '
84191aa5bc11de486d662f98d4d618b179ca45ca'
* commit '
84191aa5bc11de486d662f98d4d618b179ca45ca':
Remove unused Inspector files from Android build.
Android (Google) Code Review [Thu, 29 Oct 2009 17:21:47 +0000 (13:21 -0400)]
Merge change Id5b57453 into eclair-mr2
* changes:
Remove unused Inspector files from Android build.
Leon Scroggins [Thu, 29 Oct 2009 17:18:26 +0000 (10:18 -0700)]
am
2cc0048c: (-s ours) DO NOT MERGE. Send a message when the page changes and find is up to search again.
Merge commit '
2cc0048c05c4e957c2163d2306fba008ececc332'
* commit '
2cc0048c05c4e957c2163d2306fba008ececc332':
DO NOT MERGE. Send a message when the page changes and find is up to search again.
Leon Scroggins [Thu, 29 Oct 2009 13:47:34 +0000 (09:47 -0400)]
DO NOT MERGE. Send a message when the page changes and find is up to search again.
Fixes http://b/issue?id=
2222706
Requires a change in frameworks/base.
Not merging because we changed the way we call JNI functions.
Steve Block [Thu, 29 Oct 2009 00:46:04 +0000 (00:46 +0000)]
Remove unused Inspector files from Android build.
Change-Id: Id5b57453ee3cae7c8d765be847a4ccca0e19ce68
Steve Block [Thu, 29 Oct 2009 16:22:36 +0000 (09:22 -0700)]
am
6613ce04: Merge change Ia667b47b into eclair-mr2
Merge commit '
6613ce04263a3260e412ab09fedcfb41e523e28d'
* commit '
6613ce04263a3260e412ab09fedcfb41e523e28d':
Fix Geolocation service to use correct signature for Location.getAltitude().
Android (Google) Code Review [Thu, 29 Oct 2009 16:05:15 +0000 (12:05 -0400)]
Merge change Ia667b47b into eclair-mr2
* changes:
Fix Geolocation service to use correct signature for Location.getAltitude().
Leon Scroggins [Thu, 29 Oct 2009 12:56:31 +0000 (05:56 -0700)]
am
a3fb0891: Merge change I5d9ec169 into eclair-mr2
Merge commit '
a3fb08910591707d5aa75e687f546abec6358fcc'
* commit '
a3fb08910591707d5aa75e687f546abec6358fcc':
Pass PlatformKeyboardEvents for deletions.
Android (Google) Code Review [Thu, 29 Oct 2009 12:40:49 +0000 (08:40 -0400)]
Merge change I5d9ec169 into eclair-mr2
* changes:
Pass PlatformKeyboardEvents for deletions.
Grace Kloba [Thu, 29 Oct 2009 06:56:50 +0000 (23:56 -0700)]
am
6f172891: Merge change I47300b36 into eclair-mr2
Merge commit '
6f172891eaa14c0fc034daeba26efef699fe215d'
* commit '
6f172891eaa14c0fc034daeba26efef699fe215d':
fix instrumentation. The new WebKit has CachedResourceClient
Leon Scroggins [Thu, 29 Oct 2009 06:51:58 +0000 (23:51 -0700)]
Steve Block [Thu, 29 Oct 2009 06:49:08 +0000 (23:49 -0700)]
am
8c6c2864: Merge change I998a5863 into eclair-mr2
Merge commit '
8c6c2864439f5757f8e480c9b23f640baacb9f4f'
* commit '
8c6c2864439f5757f8e480c9b23f640baacb9f4f':
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
Grace Kloba [Thu, 29 Oct 2009 06:43:36 +0000 (23:43 -0700)]
am
4e71352f: Merge change I8e7024d6 into eclair-mr2
Merge commit '
4e71352fc03ff3e392a94407c2298c045b610311'
* commit '
4e71352fc03ff3e392a94407c2298c045b610311':
We were excluding device-width to fix http://b/issue?id=
1331654.
Cary Clark [Thu, 29 Oct 2009 06:43:29 +0000 (23:43 -0700)]
am
7b035dc1: pass the current cursor when computing the mouse position
Merge commit '
7b035dc1012763a04adddc6de25256647fea50bd'
* commit '
7b035dc1012763a04adddc6de25256647fea50bd':
pass the current cursor when computing the mouse position
Steve Block [Thu, 29 Oct 2009 06:43:13 +0000 (23:43 -0700)]
am
466006e4: Updates Geolocation to use a pair of maps to store watchers.
Merge commit '
466006e4a13fd557d7b35c1fe0b7a38384e5ce2e'
* commit '
466006e4a13fd557d7b35c1fe0b7a38384e5ce2e':
Updates Geolocation to use a pair of maps to store watchers.
Steve Block [Thu, 29 Oct 2009 06:43:05 +0000 (23:43 -0700)]
am
0ddb5835: Merge change Ia17a9f02 into eclair-mr2
Merge commit '
0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1'
* commit '
0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1':
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
Steve Block [Thu, 29 Oct 2009 06:42:56 +0000 (23:42 -0700)]
am
68f795fe: Merge change I9f515e09 into eclair-mr2
Merge commit '
68f795feee72509a25c327be4f04835459439fa2'
* commit '
68f795feee72509a25c327be4f04835459439fa2':
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
Leon Scroggins [Wed, 28 Oct 2009 21:52:13 +0000 (17:52 -0400)]
Pass PlatformKeyboardEvents for deletions.
Instead of using TypingCommand::deleteSelection, use events so
the javascript events happen, allowing autocomplete fields to work
properly.
Fixes http://b/issue?id=
2059795
Android (Google) Code Review [Wed, 28 Oct 2009 20:43:08 +0000 (16:43 -0400)]
Merge change I47300b36 into eclair-mr2
* changes:
fix instrumentation. The new WebKit has CachedResourceClient derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
Leon Scroggins [Wed, 28 Oct 2009 18:25:19 +0000 (14:25 -0400)]
Fix a clicking bug.
Remove some code that simulates a mouse click at the beginning of
a textarea and the end of a textfield. The original goal was to
make the click change the selection to be at the beginning or end
of the field, respectively. However, we actually make another call
which prevents this click from the selection. Further, the
selection actually gets changed elsewhere.
Fixes http://b/issue?id=
2219233
Grace Kloba [Wed, 28 Oct 2009 06:38:13 +0000 (23:38 -0700)]
fix instrumentation. The new WebKit has CachedResourceClient
derived from FastAllocBase which has overload operator new.
So we need to override it again to avoid ambiguous.
Android (Google) Code Review [Wed, 28 Oct 2009 17:47:37 +0000 (13:47 -0400)]
Merge change I998a5863 into eclair-mr2
* changes:
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
Steve Block [Mon, 26 Oct 2009 18:08:41 +0000 (18:08 +0000)]
Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.
The files in question are npapi.h and npruntime.h. The Android versions at
V8Bindings/npapi/ are identical to the WebKit versions, other than a couple of
trivial changes, which are accounted for in this patch.
Change-Id: I998a5863181283aa6153c84a745b1923d9b5721b
Steve Block [Wed, 28 Oct 2009 17:07:23 +0000 (17:07 +0000)]
Fix Geolocation service to use correct signature for Location.getAltitude().
This is a fix for bug http://b/issue?id=
2221243
Change-Id: Ia667b47b33c0b30eaec04b4881b61027034d0850
Android (Google) Code Review [Wed, 28 Oct 2009 16:51:53 +0000 (12:51 -0400)]
Merge change I8e7024d6 into eclair-mr2
* changes:
We were excluding device-width to fix http://b/issue?id=
1331654. But some mobile sites will have minimum pref width wider than the screen width, like in http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/.
Cary Clark [Wed, 28 Oct 2009 14:39:06 +0000 (10:39 -0400)]
pass the current cursor when computing the mouse position
Most of the time, the simulated mouse position can be
computed from the current cursor. But when the cursor
is changed, the current cursor info could be out of
date and generate a bus error.
fixes http://b/issue?id=
2061211
Steve Block [Wed, 28 Oct 2009 14:40:26 +0000 (14:40 +0000)]
Updates Geolocation to use a pair of maps to store watchers.
This reflects a recent change submitted to webkit.org (see
http://trac.webkit.org/changeset/50159). This came about in the
course of upstreaming the logic to make sure the error callback
is called when permissions have already been denied (see
http://trac.webkit.org/changeset/50190).
Also make some minor style and comment changes to reflect other
recent submissions to webkit.org.
This will avoid future merge conflicts.
Change-Id: Iafca02403b781bc2119e6e762cb04df396ca8c11
Android (Google) Code Review [Wed, 28 Oct 2009 14:17:28 +0000 (10:17 -0400)]
Merge change Ia17a9f02 into eclair-mr2
* changes:
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
Android (Google) Code Review [Wed, 28 Oct 2009 12:01:12 +0000 (08:01 -0400)]
Merge change I9f515e09 into eclair-mr2
* changes:
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
Elliott Hughes [Tue, 27 Oct 2009 23:15:10 +0000 (16:15 -0700)]
Fix build.
Grace Kloba [Tue, 27 Oct 2009 22:15:48 +0000 (15:15 -0700)]
We were excluding device-width to fix b/issue?id=
1331654.
But some mobile sites will have minimum pref width
wider than the screen width, like in
http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/.
Now we are checking width() > screenWidth before wrapping at line 958,
there is no need to exclude the device-width case. Remove the
checking and both bugs should be fixed.
OSDN Git Service
