OSDN Git Service
Grace Kloba [Thu, 10 Dec 2009 00:00:52 +0000 (16:00 -0800)]
am
3d0d3fda: Enable longpress and doubletap to WebKit as touch event if it is requested.
Merge commit '
3d0d3fdaa1308448b47592c03cda81c7f9e1f789' into eclair-mr2-plus-aosp
* commit '
3d0d3fdaa1308448b47592c03cda81c7f9e1f789':
Enable longpress and doubletap to WebKit as touch
Leon Scroggins [Tue, 8 Dec 2009 02:37:20 +0000 (18:37 -0800)]
am
c0812354: am
74757b62: Provide <input> type information to Java side.
Merge commit '
c08123548374ec7cdcf0d1ef8857807c6eda8293'
* commit '
c08123548374ec7cdcf0d1ef8857807c6eda8293':
Provide <input> type information to Java side.
Grace Kloba [Tue, 8 Dec 2009 02:33:07 +0000 (18:33 -0800)]
am
bd0d0a48: am
2eddb240: Continue https://android-git.corp.google.com/g/#change,34687,
Merge commit '
bd0d0a4863df10d7cf18613463d9a92cca7e6f04'
* commit '
bd0d0a4863df10d7cf18613463d9a92cca7e6f04':
Continue https://android-git.corp.google.com/g/#change,34687,
Grace Kloba [Tue, 8 Dec 2009 02:32:43 +0000 (18:32 -0800)]
am
f83e68ba: am
7f2ba62b: Merge change I38601c0e into eclair-mr2
Merge commit '
f83e68bac9cc98fccc70894f1f995d6b5d5eb8cd'
* commit '
f83e68bac9cc98fccc70894f1f995d6b5d5eb8cd':
Fix the wrong layout in the layout test.
Cary Clark [Tue, 8 Dec 2009 02:32:10 +0000 (18:32 -0800)]
am
9a00fbd6: am
34bca311: fix crash reading readonly node state
Merge commit '
9a00fbd61c8699856620bca057e06efca4425015'
* commit '
9a00fbd61c8699856620bca057e06efca4425015':
fix crash reading readonly node state
Leon Scroggins [Tue, 8 Dec 2009 02:32:05 +0000 (18:32 -0800)]
am
3a360998: am
dcbb033a: Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Merge commit '
3a360998e7aa91c194fa97a40131bf837f2bba1b'
* commit '
3a360998e7aa91c194fa97a40131bf837f2bba1b':
Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Steve Block [Tue, 8 Dec 2009 02:31:21 +0000 (18:31 -0800)]
am
0f8689e3: am
462daf4b: Merge change I9a5736f5 into eclair-mr2
Merge commit '
0f8689e3c342fdff08c07ae113e5b33393b15010'
* commit '
0f8689e3c342fdff08c07ae113e5b33393b15010':
Fixes a Geolocation bug with cached positions.
Steve Block [Tue, 8 Dec 2009 02:31:14 +0000 (18:31 -0800)]
am
99c4892c: am
1d68587c: Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Merge commit '
99c4892c4dc329dc28f1fee13e1603613b80fd86'
* commit '
99c4892c4dc329dc28f1fee13e1603613b80fd86':
Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Grace Kloba [Mon, 7 Dec 2009 22:57:12 +0000 (14:57 -0800)]
am
86fdeb62: (-s ours) am
6c9687c0: am
daa8318d: (-s ours) DO NOT MERGE. This is cherry picked from https://android-git.corp.google.com/g/#change,28737
Merge commit '
86fdeb62ac10d536108a49065a7337ef5c4f2ffa'
* commit '
86fdeb62ac10d536108a49065a7337ef5c4f2ffa':
DO NOT MERGE.
Leon Scroggins [Mon, 7 Dec 2009 21:43:30 +0000 (13:43 -0800)]
am
74757b62: Provide <input> type information to Java side.
Merge commit '
74757b62fce144f27c25cc7744df82cd7411b2dc' into eclair-mr2-plus-aosp
* commit '
74757b62fce144f27c25cc7744df82cd7411b2dc':
Provide <input> type information to Java side.
Leon Scroggins [Mon, 7 Dec 2009 18:42:46 +0000 (13:42 -0500)]
Provide <input> type information to Java side.
Help to fix http://b/issue?id=
1890360 and http://b/issue?id=
2150538
CacheBuilder.cpp:
Explicitly set isTextField to false for textareas.
CachedRoot:
Remove the code which checks to see if the textfield is a search,
since if it is, we can avoid this path altogether.
WebView:
Return a single integer which tells what type the current text
input field is.
Requires a change to frameworks/base.
Grace Kloba [Mon, 7 Dec 2009 18:28:35 +0000 (10:28 -0800)]
am
2eddb240: Continue https://android-git.corp.google.com/g/#change,34687,
Merge commit '
2eddb240f196ef15ba9940c3e291bbb6318f1200' into eclair-mr2-plus-aosp
* commit '
2eddb240f196ef15ba9940c3e291bbb6318f1200':
Continue https://android-git.corp.google.com/g/#change,34687,
Grace Kloba [Mon, 7 Dec 2009 17:54:17 +0000 (09:54 -0800)]
Continue https://android-git.corp.google.com/g/#change,34687,
We should use #if PLATFORM(ANDROID) now
Grace Kloba [Mon, 7 Dec 2009 17:43:24 +0000 (09:43 -0800)]
am
7f2ba62b: Merge change I38601c0e into eclair-mr2
Merge commit '
7f2ba62b6484a126bbc1f05f24f719bcd3eec387' into eclair-mr2-plus-aosp
* commit '
7f2ba62b6484a126bbc1f05f24f719bcd3eec387':
Fix the wrong layout in the layout test.
Android (Google) Code Review [Mon, 7 Dec 2009 17:39:36 +0000 (09:39 -0800)]
Merge change I38601c0e into eclair-mr2
* changes:
Fix the wrong layout in the layout test.
Cary Clark [Mon, 7 Dec 2009 16:01:19 +0000 (08:01 -0800)]
am
34bca311: fix crash reading readonly node state
Merge commit '
34bca311c8205ee40379adac2ef4da01e401600e' into eclair-mr2-plus-aosp
* commit '
34bca311c8205ee40379adac2ef4da01e401600e':
fix crash reading readonly node state
Cary Clark [Mon, 7 Dec 2009 15:36:50 +0000 (10:36 -0500)]
fix crash reading readonly node state
Something about rebuildTextView() invalidates the current cached
frame -- reading the last obtained frame after calling it may
crash. Why, I don't know. Until I figure that out, read the
cached state first.
Also remove some tests for null frame and node since the null
case has already been handled earlierin motionUp().
fixes http://b/
2307964
Leon Scroggins [Mon, 7 Dec 2009 15:41:36 +0000 (07:41 -0800)]
am
dcbb033a: Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Merge commit '
dcbb033aafed2abc472f0d88520869a6b1f1945b' into eclair-mr2-plus-aosp
* commit '
dcbb033aafed2abc472f0d88520869a6b1f1945b':
Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Leon Scroggins [Fri, 4 Dec 2009 19:54:57 +0000 (14:54 -0500)]
Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Fixes http://b/issue?id=
2299660 and http://b/issue?id=
2299650
Also remove isPassword, which is redundant.
Steve Block [Mon, 7 Dec 2009 15:07:48 +0000 (07:07 -0800)]
am
462daf4b: Merge change I9a5736f5 into eclair-mr2
Merge commit '
462daf4b80f6d97c9d1f2b446c7fd61a35c49a59' into eclair-mr2-plus-aosp
* commit '
462daf4b80f6d97c9d1f2b446c7fd61a35c49a59':
Fixes a Geolocation bug with cached positions.
Android (Google) Code Review [Mon, 7 Dec 2009 15:03:46 +0000 (07:03 -0800)]
Merge change I9a5736f5 into eclair-mr2
* changes:
Fixes a Geolocation bug with cached positions.
Steve Block [Mon, 7 Dec 2009 14:44:50 +0000 (06:44 -0800)]
am
1d68587c: Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Merge commit '
1d68587ce0a52acb0cb724ac362cee0a14bf1e8f' into eclair-mr2-plus-aosp
* commit '
1d68587ce0a52acb0cb724ac362cee0a14bf1e8f':
Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Steve Block [Thu, 3 Dec 2009 12:52:03 +0000 (12:52 +0000)]
Fixes a Geolocation bug with cached positions.
When a Geolocation watch calls back with a cached position, it could be cleared in the callback.
This change makes sure the watch still exists after the callback before starting the Geolocation service.
Change-Id: I9a5736f5ce78e1c4bb36659245ffb61b485c4018
Steve Block [Fri, 4 Dec 2009 15:36:28 +0000 (15:36 +0000)]
Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
See https://bugs.webkit.org/show_bug.cgi?id=32157
Change-Id: I1f7f0bb6fa9e72ee3eeb31160e0a828b3d076fee
Grace Kloba [Thu, 3 Dec 2009 01:39:47 +0000 (17:39 -0800)]
Fix the wrong layout in the layout test.
When we create a new WebFrameView, the bounds needs
to be transferred from the old WebFrameView. Otherwise
the new View will have (0,0) as bounds.
Add transitionToCommitted() for transitionToCommittedFromCachedFrame().
Grace Kloba [Sat, 5 Dec 2009 01:41:38 +0000 (17:41 -0800)]
am
6c9687c0: am
daa8318d: (-s ours) DO NOT MERGE. This is cherry picked from https://android-git.corp.google.com/g/#change,28737
Merge commit '
6c9687c05aead139d549da6cfcccdfd65d2f4d26' into eclair-mr2-plus-aosp
* commit '
6c9687c05aead139d549da6cfcccdfd65d2f4d26':
DO NOT MERGE.
Grace Kloba [Sat, 5 Dec 2009 01:37:14 +0000 (17:37 -0800)]
am
daa8318d: (-s ours) DO NOT MERGE. This is cherry picked from https://android-git.corp.google.com/g/#change,28737
Merge commit '
daa8318de3c63a28eccb52546c230e5c5caee962' into eclair-mr2
* commit '
daa8318de3c63a28eccb52546c230e5c5caee962':
DO NOT MERGE.
Grace Kloba [Sat, 3 Oct 2009 00:38:57 +0000 (17:38 -0700)]
DO NOT MERGE.
This is cherry picked from
https://android-git.corp.google.com/g/#change,28737
Fix http://b/issue?id=
2304741
Add check null of getRealObject(). When a WebView is
removed, there is a slight chance that getRealObject()
for WebView's JavaObject be null.
Fix http://b/issue?id=
2159815
Steve Block [Fri, 4 Dec 2009 19:28:19 +0000 (11:28 -0800)]
am
cebf4fdb: am
a8c0888c: Merge change I2b870c71 into eclair-mr2
Merge commit '
cebf4fdbdd30d0d418359bd049836c9ee4ded9de'
* commit '
cebf4fdbdd30d0d418359bd049836c9ee4ded9de':
Enables x-mac-cyrillic on Android, now that this is in our version of ICU.
Patrick Scott [Fri, 4 Dec 2009 19:25:27 +0000 (14:25 -0500)]
resolved conflicts for merge of
c8da3d7c to master
Steve Block [Fri, 4 Dec 2009 19:24:31 +0000 (11:24 -0800)]
am
a8c0888c: Merge change I2b870c71 into eclair-mr2
Merge commit '
a8c0888cc227b4fd4da23b84b2ef16f5144a8bee' into eclair-mr2-plus-aosp
* commit '
a8c0888cc227b4fd4da23b84b2ef16f5144a8bee':
Enables x-mac-cyrillic on Android, now that this is in our version of ICU.
Android (Google) Code Review [Fri, 4 Dec 2009 19:21:16 +0000 (11:21 -0800)]
Merge change I2b870c71 into eclair-mr2
* changes:
Enables x-mac-cyrillic on Android, now that this is in our version of ICU.
Patrick Scott [Fri, 4 Dec 2009 19:12:59 +0000 (11:12 -0800)]
am
2a2524d2: Merge change If686b999 into eclair-mr2
Merge commit '
2a2524d2c288155a0e88d67257f6428b79efda7f' into eclair-mr2-plus-aosp
* commit '
2a2524d2c288155a0e88d67257f6428b79efda7f':
Pass up flags for the main resource and user gesture.
Android (Google) Code Review [Fri, 4 Dec 2009 19:08:35 +0000 (11:08 -0800)]
Merge change If686b999 into eclair-mr2
* changes:
Pass up flags for the main resource and user gesture.
Grace Kloba [Fri, 4 Dec 2009 18:59:17 +0000 (10:59 -0800)]
am
e485ea22: am
9401c651: Merge change I49b2fbe0 into eclair-mr2
Merge commit '
e485ea2278f2b1a30c54b46aa21ad7458bbbf9eb'
* commit '
e485ea2278f2b1a30c54b46aa21ad7458bbbf9eb':
Only re-center the page if it is zoom change or
Grace Kloba [Fri, 4 Dec 2009 18:56:05 +0000 (10:56 -0800)]
am
9401c651: Merge change I49b2fbe0 into eclair-mr2
Merge commit '
9401c651f24855ce1db6a286789c55f796221e35' into eclair-mr2-plus-aosp
* commit '
9401c651f24855ce1db6a286789c55f796221e35':
Only re-center the page if it is zoom change or
Cary Clark [Fri, 4 Dec 2009 18:53:43 +0000 (10:53 -0800)]
Android (Google) Code Review [Fri, 4 Dec 2009 18:53:31 +0000 (10:53 -0800)]
Merge change I49b2fbe0 into eclair-mr2
* changes:
Only re-center the page if it is zoom change or orientation change. Do not re-center the page if it is caused by show/hide soft keyboard.
Cary Clark [Fri, 4 Dec 2009 18:51:29 +0000 (10:51 -0800)]
am
f4b04b8d: fix nav cache debugging
Merge commit '
f4b04b8d9c8b8aeb33ca4641594f7f0f7dc06505' into eclair-mr2-plus-aosp
* commit '
f4b04b8d9c8b8aeb33ca4641594f7f0f7dc06505':
fix nav cache debugging
Cary Clark [Fri, 4 Dec 2009 18:38:17 +0000 (10:38 -0800)]
am
021228f2: am
1d330120: move input-related fields out of CachedNode to expand
Merge commit '
021228f27b1399df5a45f3f1e7f1f12126e86e3c'
* commit '
021228f27b1399df5a45f3f1e7f1f12126e86e3c':
move input-related fields out of CachedNode to expand
Cary Clark [Fri, 4 Dec 2009 18:33:04 +0000 (13:33 -0500)]
fix nav cache debugging
last change broke debugging code outside of the build
Cary Clark [Fri, 4 Dec 2009 18:29:57 +0000 (10:29 -0800)]
am
1d330120: move input-related fields out of CachedNode to expand
Merge commit '
1d330120b6c2ee2d3f1c25300d0e3d446ef8c640' into eclair-mr2-plus-aosp
* commit '
1d330120b6c2ee2d3f1c25300d0e3d446ef8c640':
move input-related fields out of CachedNode to expand
Patrick Scott [Fri, 4 Dec 2009 18:18:31 +0000 (13:18 -0500)]
Pass up flags for the main resource and user gesture.
This requires a change to the framework.
Cary Clark [Thu, 3 Dec 2009 16:02:54 +0000 (11:02 -0500)]
move input-related fields out of CachedNode to expand
Some of the fields in CachedNode are relevant only to input
fields and text areas. Move these into their own vector
so that we can add more data without making all CacheNodes
bigger.
Remove CacheNode entries that are no longer used, or can
be consolidated into the node type. Alphabetize some interfaces
and implementations. Update the debugging output.
part of http://b/
2299660
Steve Block [Fri, 4 Dec 2009 13:42:01 +0000 (13:42 +0000)]
Enables x-mac-cyrillic on Android, now that this is in our version of ICU.
See https://android-git.corp.google.com/g/#change,34457,
which adds the encoding to ICU 3.8 in eclair-mr2, and
https://android-git.corp.google.com/g/#change,34758,
which adds the encoding to ICU 4.2 in master.
Change-Id: I2b870c714a3ee397964e6bfe14c95bdcca9ea24a
Grace Kloba [Fri, 4 Dec 2009 12:29:05 +0000 (04:29 -0800)]
am
460d4fa1: am
472affe3: Merge change Iceb63592 into eclair-mr2
Merge commit '
460d4fa19ac597fe27cc530c2a1ce0ca459cef35'
* commit '
460d4fa19ac597fe27cc530c2a1ce0ca459cef35':
Experimental change. Cache pages with unload event
Grace Kloba [Fri, 4 Dec 2009 12:29:01 +0000 (04:29 -0800)]
am
90fe16ce: am
d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change,34511 due to the history unfork change.
Merge commit '
90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12'
* commit '
90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12':
Rework CL, https://android-git.corp.google.com/g/#change,34511
Grace Kloba [Fri, 4 Dec 2009 12:28:56 +0000 (04:28 -0800)]
am
69bf013f: am
ab87fa9e: another file to fix the build
Merge commit '
69bf013f4ecf5f43a1a40cf908623708c5f43e21'
* commit '
69bf013f4ecf5f43a1a40cf908623708c5f43e21':
another file to fix the build
Grace Kloba [Fri, 4 Dec 2009 12:28:52 +0000 (04:28 -0800)]
am
4ee2e705: am
4f016e5e: Fix the build due to auto merge
Merge commit '
4ee2e705696ac652df49d552efbe58c92c031e47'
* commit '
4ee2e705696ac652df49d552efbe58c92c031e47':
Fix the build due to auto merge
Grace Kloba [Fri, 4 Dec 2009 12:28:46 +0000 (04:28 -0800)]
am
4597d847: am
fdd2ae40: After turning on page cache, the parent HistoryItem can be destroyed before the child HistoryItem, add an extra checking to avoid crash.
Merge commit '
4597d8475fb0249f7c75b4704744dd1d8d5e9abe'
* commit '
4597d8475fb0249f7c75b4704744dd1d8d5e9abe':
After turning on page cache, the parent HistoryItem
Steve Block [Fri, 4 Dec 2009 12:05:43 +0000 (04:05 -0800)]
am
848947b8: am
f587615e: Merge change I70c3076b into eclair-mr2
Merge commit '
848947b8933ab66822b467c10b16134296840462'
* commit '
848947b8933ab66822b467c10b16134296840462':
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
Ben Murdoch [Fri, 4 Dec 2009 11:44:00 +0000 (11:44 +0000)]
resolved conflicts for merge of
130cd407 to master
Change-Id: I472802c99be3510e346350f66a386643caba6410
Grace Kloba [Fri, 4 Dec 2009 08:32:52 +0000 (00:32 -0800)]
Only re-center the page if it is zoom change or
orientation change. Do not re-center the page if
it is caused by show/hide soft keyboard.
Fix http://b/issue?id=
2303918
Ben Murdoch [Fri, 4 Dec 2009 01:22:18 +0000 (17:22 -0800)]
am
5ace520b: am
970b5d95: Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Merge commit '
5ace520b49fa0fc8000a2ea8517b90c4e941ef94'
* commit '
5ace520b49fa0fc8000a2ea8517b90c4e941ef94':
Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Ben Murdoch [Fri, 4 Dec 2009 01:22:11 +0000 (17:22 -0800)]
am
b34660e8: am
ed3dcbaa: Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Merge commit '
b34660e801f28f3f9722484997c5a9419e60d204'
* commit '
b34660e801f28f3f9722484997c5a9419e60d204':
Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Ben Murdoch [Fri, 4 Dec 2009 01:22:03 +0000 (17:22 -0800)]
am
3a5df497: am
5c7b027a: Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp This should be upstreamed to webkit.org
Merge commit '
3a5df4979ee5a32cd8d2922e5f41577a8e1d1b46'
* commit '
3a5df4979ee5a32cd8d2922e5f41577a8e1d1b46':
Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp
Grace Kloba [Fri, 4 Dec 2009 00:43:14 +0000 (16:43 -0800)]
am
472affe3: Merge change Iceb63592 into eclair-mr2
Merge commit '
472affe311f3854aaac7cca73d398d36a9eefaf3' into eclair-mr2-plus-aosp
* commit '
472affe311f3854aaac7cca73d398d36a9eefaf3':
Experimental change. Cache pages with unload event
Grace Kloba [Fri, 4 Dec 2009 00:34:42 +0000 (16:34 -0800)]
am
d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change,34511 due to the history unfork change.
Merge commit '
d262e1f9241778a6d0483945a3e125636cedfb70' into eclair-mr2-plus-aosp
* commit '
d262e1f9241778a6d0483945a3e125636cedfb70':
Rework CL, https://android-git.corp.google.com/g/#change,34511
Grace Kloba [Fri, 4 Dec 2009 00:32:11 +0000 (16:32 -0800)]
am
ab87fa9e: another file to fix the build
Merge commit '
ab87fa9e3781b4b32b4c1014acd9079ea145e2d6' into eclair-mr2-plus-aosp
* commit '
ab87fa9e3781b4b32b4c1014acd9079ea145e2d6':
another file to fix the build
Grace Kloba [Fri, 4 Dec 2009 00:32:06 +0000 (16:32 -0800)]
am
4f016e5e: Fix the build due to auto merge
Merge commit '
4f016e5ec4ca26ad35c960dd81c2f631e385cdce' into eclair-mr2-plus-aosp
* commit '
4f016e5ec4ca26ad35c960dd81c2f631e385cdce':
Fix the build due to auto merge
Grace Kloba [Fri, 4 Dec 2009 00:27:53 +0000 (16:27 -0800)]
am
fdd2ae40: After turning on page cache, the parent HistoryItem can be destroyed before the child HistoryItem, add an extra checking to avoid crash.
Merge commit '
fdd2ae400181744b916fcc8319e68f1cec57c981' into eclair-mr2-plus-aosp
* commit '
fdd2ae400181744b916fcc8319e68f1cec57c981':
After turning on page cache, the parent HistoryItem
Android (Google) Code Review [Thu, 3 Dec 2009 23:47:48 +0000 (15:47 -0800)]
Merge change Iceb63592 into eclair-mr2
* changes:
Experimental change. Cache pages with unload event for back/forward. This will improve the history navigation. But it may break some sites. See discussion in https://bugs.webkit.org/show_bug.cgi?id=29021.
Grace Kloba [Thu, 3 Dec 2009 17:53:55 +0000 (09:53 -0800)]
Experimental change. Cache pages with unload event
for back/forward. This will improve the history
navigation. But it may break some sites. See discussion
in https://bugs.webkit.org/show_bug.cgi?id=29021.
Grace Kloba [Thu, 3 Dec 2009 19:39:15 +0000 (11:39 -0800)]
Rework CL, https://android-git.corp.google.com/g/#change,34511
due to the history unfork change.
Grace Kloba [Thu, 3 Dec 2009 19:01:07 +0000 (11:01 -0800)]
another file to fix the build
Grace Kloba [Thu, 3 Dec 2009 18:56:34 +0000 (10:56 -0800)]
Fix the build due to auto merge
Grace Kloba [Wed, 2 Dec 2009 20:37:26 +0000 (12:37 -0800)]
After turning on page cache, the parent HistoryItem
can be destroyed before the child HistoryItem, add
an extra checking to avoid crash.
Steve Block [Thu, 3 Dec 2009 12:59:35 +0000 (04:59 -0800)]
am
f587615e: Merge change I70c3076b into eclair-mr2
Merge commit '
f587615e225cc1d172fe35e0dc744c00e929168d' into eclair-mr2-plus-aosp
* commit '
f587615e225cc1d172fe35e0dc744c00e929168d':
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
Android (Google) Code Review [Thu, 3 Dec 2009 12:56:02 +0000 (04:56 -0800)]
Merge change I70c3076b into eclair-mr2
* changes:
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
Ben Murdoch [Thu, 3 Dec 2009 12:35:17 +0000 (04:35 -0800)]
am
be33b78f: Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
Merge commit '
be33b78f63b17f1b6f5a36a503d797d5f9b941ee' into eclair-mr2-plus-aosp
* commit '
be33b78f63b17f1b6f5a36a503d797d5f9b941ee':
Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
Ben Murdoch [Thu, 3 Dec 2009 12:35:13 +0000 (04:35 -0800)]
am
970b5d95: Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Merge commit '
970b5d950cbc4b5089ff8bb091d896ddf58ad83a' into eclair-mr2-plus-aosp
* commit '
970b5d950cbc4b5089ff8bb091d896ddf58ad83a':
Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
Ben Murdoch [Thu, 3 Dec 2009 12:35:08 +0000 (04:35 -0800)]
am
ed3dcbaa: Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Merge commit '
ed3dcbaa89ede50bb054f63aa1847ae6240fa70d' into eclair-mr2-plus-aosp
* commit '
ed3dcbaa89ede50bb054f63aa1847ae6240fa70d':
Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
Ben Murdoch [Thu, 3 Dec 2009 12:16:52 +0000 (04:16 -0800)]
am
5c7b027a: Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp This should be upstreamed to webkit.org
Merge commit '
5c7b027ae1636ed27f6917385c2b3ec37af33237' into eclair-mr2-plus-aosp
* commit '
5c7b027ae1636ed27f6917385c2b3ec37af33237':
Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp
Ben Murdoch [Thu, 26 Nov 2009 14:58:02 +0000 (14:58 +0000)]
Android History unforking pt4: Android specific changes to makefiles and other code that has not been upstreamed yet (i.e. WebKit/android).
This does NOT need to be upstreamed to WebKit (yet).
Change-Id: I821fb90c3e463ef5fc4fa001ee5b8d967f9f7e48
Ben Murdoch [Thu, 26 Nov 2009 14:53:09 +0000 (14:53 +0000)]
Android History unforking pt3: Changes to the notifyHIstoryItemChanged function and the places it is used.
This needs to be upstreamed to webkit.org.
Change-Id: I5dc4e40939448e0b1dfcd6393082036fc8174aa9
Ben Murdoch [Thu, 26 Nov 2009 14:49:53 +0000 (14:49 +0000)]
Android History unforking pt2: BackForwardList changes. Fire a notification to the FrameLoaderClient that the BackForwardList has been modified.
This needs to be upstreamed to webkit.org.
Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
Ben Murdoch [Thu, 26 Nov 2009 14:11:05 +0000 (14:11 +0000)]
Android history unforking pt 1: Add Android specific files and #if PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp
This should be upstreamed to webkit.org
Change-Id: I3f822d5a6579080658242f846214e1c3fe31fa01
Steve Block [Thu, 3 Dec 2009 11:11:15 +0000 (11:11 +0000)]
Fixes a crashing Geolocation bug when a watch is cleared from certain callbacks.
BUG: http://b/
2297475
This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32111
Change-Id: I70c3076b1a85c89bc4c587ea9fedaa84bd7b0575
Leon Scroggins [Thu, 3 Dec 2009 04:36:41 +0000 (20:36 -0800)]
am
2e36087f: am
4e95824e: Save form data for elements other than type "text".
Merge commit '
2e36087fc1e77130a596ec30566928462570b162'
* commit '
2e36087fc1e77130a596ec30566928462570b162':
Save form data for elements other than type "text".
Grace Kloba [Thu, 3 Dec 2009 04:35:07 +0000 (20:35 -0800)]
am
1573e25e: am
8ec42170: Enable WebKit page cache through WebSettings.
Merge commit '
1573e25e3a50d588fb83b3e4be6fb8bf5dc7ec65'
* commit '
1573e25e3a50d588fb83b3e4be6fb8bf5dc7ec65':
Enable WebKit page cache through WebSettings.
Grace Kloba [Thu, 3 Dec 2009 04:29:55 +0000 (20:29 -0800)]
am
2c5eb99f: am
73b03f71: Merge change Ie0a2c0d4 into eclair-mr2
Merge commit '
2c5eb99f7c6a71583620a93bc07b161751c34e17'
* commit '
2c5eb99f7c6a71583620a93bc07b161751c34e17':
Move dump display tree to sdcard as dom and render tree.
Cary Clark [Thu, 3 Dec 2009 04:26:10 +0000 (20:26 -0800)]
am
ac94ea1b: am
5f1379c6: Merge change I3aa3fc5b into eclair-mr2
Merge commit '
ac94ea1b6a7f61d693151647c572f1c33b2cdbf6'
* commit '
ac94ea1b6a7f61d693151647c572f1c33b2cdbf6':
skip nodes when building nav cache if parents are clipped out
Cary Clark [Thu, 3 Dec 2009 04:25:10 +0000 (20:25 -0800)]
am
b50d4472: am
96070103: nav to container if it wants key events
Merge commit '
b50d4472b389f7d51a80b6082ba1f5cfceead194'
* commit '
b50d4472b389f7d51a80b6082ba1f5cfceead194':
nav to container if it wants key events
Steve Block [Thu, 3 Dec 2009 04:20:07 +0000 (20:20 -0800)]
am
8845a283: am
fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '
8845a2839cb6fb5d1c221fee655feb30a49e2ecb'
* commit '
8845a2839cb6fb5d1c221fee655feb30a49e2ecb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Leon Scroggins [Wed, 2 Dec 2009 20:46:36 +0000 (12:46 -0800)]
am
4e95824e: Save form data for elements other than type "text".
Merge commit '
4e95824e8ae0b33b964420c5cd6dc13580adeafd' into eclair-mr2-plus-aosp
* commit '
4e95824e8ae0b33b964420c5cd6dc13580adeafd':
Save form data for elements other than type "text".
Leon Scroggins [Wed, 2 Dec 2009 19:47:32 +0000 (14:47 -0500)]
Save form data for elements other than type "text".
Partial fix for http://b/issue?id=
2232001
When returning the form data for a page, check other types of textfields
besides "text" input elements. Also consider "email", "number", etc.
Grace Kloba [Wed, 2 Dec 2009 19:48:51 +0000 (11:48 -0800)]
am
8ec42170: Enable WebKit page cache through WebSettings.
Merge commit '
8ec4217018562da37ecf4144e582fa848b807263' into eclair-mr2-plus-aosp
* commit '
8ec4217018562da37ecf4144e582fa848b807263':
Enable WebKit page cache through WebSettings.
Patrick Scott [Fri, 16 Oct 2009 19:11:59 +0000 (15:11 -0400)]
Use STLPort instead of our stripped version.
This fixes the simulator build and allows us to get closer to sharing code with
chromium.
STLPort was copied with minor edits from the Android port of gears.
Grace Kloba [Tue, 24 Nov 2009 22:22:22 +0000 (14:22 -0800)]
Enable WebKit page cache through WebSettings.
Add setXX() for the meta data in Settings.
Add CachedFramePlatformDataAndroid to preserve the
state for the cachedFrame.
http://b/issue?id=
2284168
Grace Kloba [Wed, 2 Dec 2009 17:57:56 +0000 (09:57 -0800)]
am
73b03f71: Merge change Ie0a2c0d4 into eclair-mr2
Merge commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d' into eclair-mr2-plus-aosp
* commit '
73b03f71b87666e532e997c6bcd3eb6a4fc3228d':
Move dump display tree to sdcard as dom and render tree.
Android (Google) Code Review [Wed, 2 Dec 2009 17:51:27 +0000 (09:51 -0800)]
Merge change Ie0a2c0d4 into eclair-mr2
* changes:
Move dump display tree to sdcard as dom and render tree.
Cary Clark [Wed, 2 Dec 2009 17:50:59 +0000 (09:50 -0800)]
am
5f1379c6: Merge change I3aa3fc5b into eclair-mr2
Merge commit '
5f1379c6c79e49753999830866c2809a920cc3e4' into eclair-mr2-plus-aosp
* commit '
5f1379c6c79e49753999830866c2809a920cc3e4':
skip nodes when building nav cache if parents are clipped out
Android (Google) Code Review [Wed, 2 Dec 2009 17:41:07 +0000 (09:41 -0800)]
Merge change I3aa3fc5b into eclair-mr2
* changes:
skip nodes when building nav cache if parents are clipped out
Cary Clark [Wed, 2 Dec 2009 17:12:19 +0000 (12:12 -0500)]
skip nodes when building nav cache if parents are clipped out
This is a fairly conservative fix, since it actually checks to
see if a parent element is clipped out, rather than the bounds
of the element itself.
fixes http://b/
2291936
Cary Clark [Wed, 2 Dec 2009 14:25:21 +0000 (06:25 -0800)]
am
96070103: nav to container if it wants key events
Merge commit '
960701032df6956d9fb640a26d315122f7b2c4be' into eclair-mr2-plus-aosp
* commit '
960701032df6956d9fb640a26d315122f7b2c4be':
nav to container if it wants key events
Cary Clark [Wed, 2 Dec 2009 13:59:01 +0000 (08:59 -0500)]
nav to container if it wants key events
When a text field or text area (or plugin) has another navable
element completely overlaying it, allow the trackball to move
from that inner element to the outer one.
Also, allow this to get a 'second chance' -- treat the case
when one element overlays another as a spacial nav and allow
it to retry in nav find algorithms.
fixes http://b/
2266756
Steve Block [Wed, 2 Dec 2009 12:20:35 +0000 (04:20 -0800)]
am
fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '
fb77ce99397e423500cc148c206ffe89796091fb' into eclair-mr2-plus-aosp
* commit '
fb77ce99397e423500cc148c206ffe89796091fb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Steve Block [Thu, 26 Nov 2009 11:24:22 +0000 (11:24 +0000)]
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
See http://trac.webkit.org/changeset/51540
Change-Id: If60a5650750b1dc48353773947d451f4e8a3ec52
Jean-Baptiste Queru [Wed, 2 Dec 2009 03:13:09 +0000 (19:13 -0800)]
Revert "Don't use the WebKit STL when building the simulator"
This reverts commit
afa94bcc85b11e170818a896b14f38521d11d333.
Grace Kloba [Mon, 23 Nov 2009 23:40:48 +0000 (15:40 -0800)]
Move dump display tree to sdcard as dom and render tree.
Fix dump render tree code.