OSDN Git Service
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, 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.
Leon Scroggins [Tue, 27 Oct 2009 20:39:18 +0000 (13:39 -0700)]
am
f74580c1: Allow touches to change the selection.
Merge commit '
f74580c1504dcdd43fd15995b0e137982512dba2'
* commit '
f74580c1504dcdd43fd15995b0e137982512dba2':
Allow touches to change the selection.
Leon Scroggins [Fri, 23 Oct 2009 20:14:33 +0000 (16:14 -0400)]
Allow touches to change the selection.
Fixes http://b/issue?id=
1650395 Lets touches change the selection
while ignoring changes from trackball events. When a touch puts
a textfield in focus, tell the WebTextView to set mOkayForFocusNotToMatch.
Requires a change in frameworks/base.
Android (Google) Code Review [Tue, 27 Oct 2009 19:19:47 +0000 (15:19 -0400)]
Merge change Ieb2fbf7a
* changes:
Use native weak references instead of our wrapper.
Patrick Scott [Tue, 27 Oct 2009 19:09:59 +0000 (12:09 -0700)]
am
64d1f380: Merge change Ib24a54e5 into eclair-mr2
Merge commit '
64d1f380c954e4c93433fae705c6f27607f1d922'
* commit '
64d1f380c954e4c93433fae705c6f27607f1d922':
Remove bad assert.
Android (Google) Code Review [Tue, 27 Oct 2009 18:06:09 +0000 (14:06 -0400)]
Merge change Ib24a54e5 into eclair-mr2
* changes:
Remove bad assert.
Grace Kloba [Tue, 27 Oct 2009 17:24:07 +0000 (10:24 -0700)]
Avoid constructing the MutexLocker class to avoid
two mystery crashes.
Patrick Scott [Thu, 22 Oct 2009 16:14:01 +0000 (12:14 -0400)]
Use native weak references instead of our wrapper.
Revert "Add check null of getRealObject(). When a WebView is"
This reverts commit
b47ea2b1184167767692f88c1e5f3e4e89db04b2.
Revert "Update the comment for checking null in needtouchevents."
This reverts commit
1e67e45d20ead40b0407618abbc5e20840dc3c80.
Revert "Check null for WebViewCore's nativeClass before calling"
This reverts commit
992afbebfb735ec2dd52b4166c22ab55827d88ed.
Fix a few places where DeleteLocalRef and DeleteGlobalRef were used incorrectly.
Fix a compilation warning as well.
Derek Sollenberger [Tue, 27 Oct 2009 15:34:49 +0000 (08:34 -0700)]
am
c7d90905: changing how plugins gain/lose focus.
Merge commit '
c7d9090583638605a2c8a779642ad09d1a228520'
* commit '
c7d9090583638605a2c8a779642ad09d1a228520':
changing how plugins gain/lose focus.
Cary Clark [Tue, 27 Oct 2009 15:17:05 +0000 (08:17 -0700)]
Derek Sollenberger [Tue, 27 Oct 2009 13:50:23 +0000 (09:50 -0400)]
changing how plugins gain/lose focus.
Previously we were keeping our own state in the UI thread to
determine when to send events to the plugin. This change removes
that logic and uses the document focus to determine when events
are to be sent. This also fixes problems with the plugins
occasionally not receiving lose focus events.
see bug http://b/
2033843
Cary Clark [Mon, 26 Oct 2009 19:47:34 +0000 (15:47 -0400)]
tweak select text
webkit changed the behavior of hitTestResultAtPoint; it used
to return the innermost node hit, but does so no longer.
Work around this by searching the returned node for a text
node.
Start the text detection one pixel lower. This fixes picking up
the first line of a link on m.msn.com.
Simplify the selection drawing. Share code between the arrow and
the i-beam. Center the i-beam on the arrow. Use relative path
construction to simplify the i-beam.
Add debugging.
Requires a companion change in frameworks/base
partially fixes http://b/issue?id=
1667690
Patrick Scott [Tue, 27 Oct 2009 14:39:57 +0000 (10:39 -0400)]
Remove bad assert.
The original assert was meant to assert that the body renderer layout state is
not modified during the expansion of the iframe. This can falsely fire if the
body renderer already needed a layout before the iframe expansion.
Andrei Popescu [Tue, 27 Oct 2009 12:21:29 +0000 (05:21 -0700)]
am
d7a32d06: Merge change I676eb2d5 into eclair-mr2
Merge commit '
d7a32d06b4a2872680edc40f01ecce12e3b61b4a'
* commit '
d7a32d06b4a2872680edc40f01ecce12e3b61b4a':
Avoid calling setDatabaseDirectoryPath() when the path is already set.
Android (Google) Code Review [Tue, 27 Oct 2009 12:04:50 +0000 (08:04 -0400)]
Merge change I676eb2d5 into eclair-mr2
* changes:
Avoid calling setDatabaseDirectoryPath() when the path is already set.
Andrei Popescu [Tue, 27 Oct 2009 11:58:04 +0000 (11:58 +0000)]
Avoid calling setDatabaseDirectoryPath() when the path is already set.
http://b/issue?id=
2215217
Steve Block [Fri, 23 Oct 2009 11:43:55 +0000 (12:43 +0100)]
Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
See https://bugs.webkit.org/show_bug.cgi?id=30678
This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts.
Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
Steve Block [Fri, 23 Oct 2009 09:28:40 +0000 (10:28 +0100)]
Brings V8 binding ifdef changes in to line with version submitted to webkit.org
See https://bugs.webkit.org/show_bug.cgi?id=30697
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DOMObjectsInclude.h WebCore/bindings/v8/DOMObjectsInclude.h
36d35
< #include "CanvasActiveInfo.h"
186a186,193
> #if ENABLE(GEOLOCATION)
> #include "Coordinates.h"
> #include "Geolocation.h"
> #include "Geoposition.h"
> #include "PositionError.h"
> #include "PositionErrorCallback.h"
> #endif
>
222a230,238
> #if PLATFORM(ANDROID)
> // TODO: Upstream TOUCH_EVENTS guard.
> #if ENABLE(TOUCH_EVENTS)
> #include "Touch.h"
> #include "TouchList.h"
> #include "TouchEvent.h"
> #endif
> #endif
>
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
37d36
< #include "bindings/V8CanvasActiveInfo.cpp"
100a100
> #include "bindings/V8Geolocation.cpp"
190,
191d189
< #include "bindings/V8Notification.cpp"
< #include "bindings/V8NotificationCenter.cpp"
258d255
< #include "bindings/V8SharedWorkerContext.cpp"
366a364
> #include "bindings/V8SVGURIReference.cpp"
386a385,392
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream NOTIFICATIONS guard.
> #if ENABLE(NOTIFICATIONS)
> #include "bindings/V8Notification.cpp"
> #include "bindings/V8NotificationCenter.cpp"
> #endif
> #endif
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.cpp WebCore/bindings/v8/V8Index.cpp
37d36
< #include "V8CanvasActiveInfo.h"
358a358
> #include "V8SVGURIReference.h"
392d391
< #include "V8SharedWorkerContext.h"
437a437,454
> #if PLATFORM(ANDROID)
> // TODO: Upstream these guards to webkit.org
> #if ENABLE(GEOLOCATION)
> #include "V8Coordinates.h"
> #include "V8Geolocation.h"
> #include "V8Geoposition.h"
> #include "V8PositionError.h"
> #endif
>
> #if ENABLE(TOUCH_EVENTS)
> #include "V8Touch.h"
> #include "V8TouchList.h"
> #include "V8TouchEvent.h"
> #endif
>
> #include "V8VoidCallback.h"
> #endif // PLATFORM(ANDROID)
>
$ diff ~/WebKitToT/WebKit/WebCore/bindings/v8/V8Index.h WebCore/bindings/v8/V8Index.h
448d447
< V(CANVASACTIVEINFO, CanvasActiveInfo) \
493a493,523
> #if ENABLE(GEOLOCATION)
> #define DOM_OBJECT_GEOLOCATION_TYPES(V) \
> V(COORDINATES, Coordinates) \
> V(GEOLOCATION, Geolocation) \
> V(GEOPOSITION, Geoposition) \
> V(POSITIONERROR, PositionError)
> #else
> #define DOM_OBJECT_GEOLOCATION_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // TODO: Upstream this guard.
> #if ENABLE(TOUCH_EVENTS)
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
> V(TOUCHLIST, TouchList) \
> V(TOUCHEVENT, TouchEvent) \
> V(TOUCH, Touch)
> #else
> #define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
> #endif
> #endif
>
> #if PLATFORM(ANDROID)
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V) \
> V(VOIDCALLBACK, VoidCallback)
> #else
> #define DOM_OBJECT_VOIDCALLBACK_TYPES(V)
> #endif
>
> #if PLATFORM(ANDROID)
> // This block is modified, but is not Android-specific.
502a533,535
> DOM_OBJECT_GEOLOCATION_TYPES(V) \
> DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
> DOM_OBJECT_VOIDCALLBACK_TYPES(V) \
503a537
> #endif
Change-Id: I9f515e0918417879813f2ff8d67df16db9bae754
Steve Block [Mon, 26 Oct 2009 16:09:17 +0000 (09:09 -0700)]
am
1e13e466: Merge change I3788a1e3 into eclair-mr2
Merge commit '
1e13e466217c7ffb96f5cde0ad0ab8606c0c2481'
* commit '
1e13e466217c7ffb96f5cde0ad0ab8606c0c2481':
Remove XPathNSResolver from the Android build.
Android (Google) Code Review [Mon, 26 Oct 2009 15:53:51 +0000 (11:53 -0400)]
Merge change I3788a1e3 into eclair-mr2
* changes:
Remove XPathNSResolver from the Android build.
Andrei Popescu [Mon, 26 Oct 2009 15:43:32 +0000 (08:43 -0700)]
am
064849d8: Merge change I3a8abed5 into eclair-mr2
Merge commit '
064849d86c5d90bf7459b0e8bd781de92141499c'
* commit '
064849d86c5d90bf7459b0e8bd781de92141499c':
Enable the dispatching of the 'ended' media event.
Android (Google) Code Review [Mon, 26 Oct 2009 15:26:53 +0000 (11:26 -0400)]
Merge change I3a8abed5 into eclair-mr2
* changes:
Enable the dispatching of the 'ended' media event.
Andrei Popescu [Mon, 26 Oct 2009 15:21:19 +0000 (15:21 +0000)]
Enable the dispatching of the 'ended' media event.
Partial fix for http://b/issue?id=
2210105
Patrick Scott [Mon, 26 Oct 2009 14:51:40 +0000 (07:51 -0700)]
am
0845a459: Change the assert to check for JNI_OK
Merge commit '
0845a4594c81421404715b666f5b3c989d9b2c5c'
* commit '
0845a4594c81421404715b666f5b3c989d9b2c5c':
Change the assert to check for JNI_OK
Patrick Scott [Mon, 26 Oct 2009 14:22:19 +0000 (07:22 -0700)]
am
4fa0517d: Change eventTypes to eventNames to fix the assert.
Merge commit '
4fa0517dc551c82c1123712b9324bd90ed193d14'
* commit '
4fa0517dc551c82c1123712b9324bd90ed193d14':
Change eventTypes to eventNames to fix the assert.
Patrick Scott [Mon, 26 Oct 2009 14:11:29 +0000 (10:11 -0400)]
Change the assert to check for JNI_OK
jniRegisterNativeMethods returns -1 (JNI_ERR) or 0 (JNI_OK), not the number of
methods registered.
Patrick Scott [Mon, 26 Oct 2009 13:32:52 +0000 (09:32 -0400)]
Change eventTypes to eventNames to fix the assert.