OSDN Git Service
Steve Block [Thu, 17 Dec 2009 17:55:18 +0000 (09:55 -0800)]
am
dc11ae82: Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Merge commit '
dc11ae82374cba25ed19c3e57537cbc667f8efe2' into eclair-mr2-plus-aosp
* commit '
dc11ae82374cba25ed19c3e57537cbc667f8efe2':
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Steve Block [Thu, 17 Dec 2009 17:55:06 +0000 (09:55 -0800)]
am
643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '
643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '
643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Steve Block [Tue, 15 Dec 2009 11:09:43 +0000 (11:09 +0000)]
Merge webkit.org at r51976 : Fix conflicts in Makefiles.
Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858
and http://trac.webkit.org/changeset/51926
Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
Steve Block [Tue, 15 Dec 2009 10:12:09 +0000 (10:12 +0000)]
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Mike Reed [Thu, 17 Dec 2009 16:23:58 +0000 (08:23 -0800)]
am
d026980f: register the eventinterface with our dispatcher list
Merge commit '
d026980fde6eb3b01c1fe49441174e89cd1be298' into eclair-mr2-plus-aosp
* commit '
d026980fde6eb3b01c1fe49441174e89cd1be298':
register the eventinterface with our dispatcher list
Mike Reed [Thu, 17 Dec 2009 16:10:47 +0000 (11:10 -0500)]
register the eventinterface with our dispatcher list
Grace Kloba [Wed, 16 Dec 2009 22:15:40 +0000 (14:15 -0800)]
am
050a2ac7: Merge change Ifcce71fa into eclair-mr2
Merge commit '
050a2ac71a7846555f8c059b5074195feab70f7f' into eclair-mr2-plus-aosp
* commit '
050a2ac71a7846555f8c059b5074195feab70f7f':
Implement the full screen WebView plugin.
Android (Google) Code Review [Wed, 16 Dec 2009 22:11:38 +0000 (14:11 -0800)]
Merge change Ifcce71fa into eclair-mr2
* changes:
Implement the full screen WebView plugin.
Grace Kloba [Wed, 16 Dec 2009 19:39:26 +0000 (11:39 -0800)]
Implement the full screen WebView plugin.
Use a NoTitleBar_Fullscreen dialog to implement the
full screen plugin. This runs in the same thread as
WebView (UI in the Browser case). One catch is that
the SurfaceView provided by the plugin needs to be
opaque if it doesn't want to see through the WebView.
The PluginFullScreenHolder translates the events to
the underline WebView. Special treatment in the touch
case as it needs to translate the coordinates.
WebView can't be panned, or double tap to zoom, or
long press to trigger the context menu while having
a full screen plugin.
Inside webkit, we also give the plugin element focus
when it goes to the full screen so that it takes key
events. While handling key events, we don't let it
loose focus or scroll out.
Todo:
When a plugin goes to full screen, we should make
sure the embedded plugin is fully visible. Otherwise
when we translate the touch events back, they will be
outside of the visible rect and will be ignored.
This is part 2 of 2-project check in.
Patrick Scott [Tue, 15 Dec 2009 20:53:37 +0000 (12:53 -0800)]
am
802287c2: Fix the benchmark app yet again to work in mr2 (and master).
Merge commit '
802287c282ab2d325404825796b77d0e15a6b053' into eclair-mr2-plus-aosp
* commit '
802287c282ab2d325404825796b77d0e15a6b053':
Fix the benchmark app yet again to work in mr2 (and master).
Patrick Scott [Tue, 15 Dec 2009 20:34:48 +0000 (15:34 -0500)]
Fix the benchmark app yet again to work in mr2 (and master).
The signature of startLoadingResource changed. The PageCache can change the
FrameView so don't use the local one. Add a few more function intercepts in the
fake vm.
Cary Clark [Tue, 15 Dec 2009 18:38:58 +0000 (10:38 -0800)]
am
d4924af1: check to see if nav cache is up to date on tap
Merge commit '
d4924af12855cd19162ba1442a6055664c98ca32' into eclair-mr2-plus-aosp
* commit '
d4924af12855cd19162ba1442a6055664c98ca32':
check to see if nav cache is up to date on tap
Cary Clark [Fri, 11 Dec 2009 17:50:10 +0000 (12:50 -0500)]
check to see if nav cache is up to date on tap
- WebKit/android/jni/WebViewCore.cpp
- WebKit/android/jni/WebViewCore.h
Add validNodeAndBounds() to determine if the clicked cached
node is good. First check to see if the pointer
to the frame and node still exist in the DOM. If
they do, see if the hit test bounds they point
to is the same as when the cache was recorded.
- WebKit/android/nav/CacheBuilder.cpp
- WebKit/android/nav/CachedNode.h
Record the original absolute bounds for later
comparison.
- WebKit/android/nav/CacheBuilder.h
Make getAreaRect() public so it can be called by
validation.
- WebKit/android/nav/WebView.cpp
Enhance motionUp() with additional validation:
use pointInNavCache() to see if there's a cached node;
wait for message from webkit to see if bounds is unchanged;
then use motionUp() to pass the original or altered click.
This is a two-part change with frameworks/base.
Fixes http://b/
2249425
Leon Scroggins [Tue, 15 Dec 2009 13:56:14 +0000 (05:56 -0800)]
am
334e51bc: Provide localized strings for <input> labels.
Merge commit '
334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e' into eclair-mr2-plus-aosp
* commit '
334e51bc2ff9bf7fc55fa67dc8a6d9257501a32e':
Provide localized strings for <input> labels.
Leon Scroggins [Fri, 11 Dec 2009 20:12:12 +0000 (15:12 -0500)]
Provide localized strings for <input> labels.
Fix for http://b/issue?id=
2178786
Call up to Java to get strings for <input> labels, and use them
on inputs.
Requires a change in frameworks/base.
Andrei Popescu [Tue, 15 Dec 2009 13:05:47 +0000 (05:05 -0800)]
Andrei Popescu [Tue, 15 Dec 2009 12:26:47 +0000 (12:26 +0000)]
Do not merge
Replicate https://android-git.corp.google.com/g/#change,35704 to mr2
to leave this branch in a sane state. Otherwise, the browser crashes on startup.
Andrei Popescu [Mon, 14 Dec 2009 23:27:16 +0000 (15:27 -0800)]
am
34c09402: Merge change Ic29b39b8 into eclair-mr2
Merge commit '
34c094028c1a0d04a7dc21256c0cfde68ec4d93f' into eclair-mr2-plus-aosp
* commit '
34c094028c1a0d04a7dc21256c0cfde68ec4d93f':
Replace the C-cast used to determine whether the resource handle represent the main resource.
Android (Google) Code Review [Mon, 14 Dec 2009 19:41:37 +0000 (11:41 -0800)]
Merge change Ic29b39b8 into eclair-mr2
* changes:
Replace the C-cast used to determine whether the resource handle represent the main resource.
Andrei Popescu [Mon, 14 Dec 2009 12:45:34 +0000 (12:45 +0000)]
Replace the C-cast used to determine whether the resource handle represent the main resource.
Fix style to match webkit style.
Derek Sollenberger [Mon, 14 Dec 2009 14:11:24 +0000 (06:11 -0800)]
am
b13fe228: Notify native plugin code when the browser discards the customView.
Merge commit '
b13fe2289ea65a0b980e31d4dc680d811ec6fdf6' into eclair-mr2-plus-aosp
* commit '
b13fe2289ea65a0b980e31d4dc680d811ec6fdf6':
Notify native plugin code when the browser discards the customView.
Derek Sollenberger [Tue, 8 Dec 2009 20:44:57 +0000 (15:44 -0500)]
Notify native plugin code when the browser discards the customView.
Grace Kloba [Fri, 11 Dec 2009 22:25:42 +0000 (14:25 -0800)]
am
9652d6b8: Rollback to return density for scaleFactor.
Merge commit '
9652d6b88e01f27d69c804ac6bc56b527b33c219' into eclair-mr2-plus-aosp
* commit '
9652d6b88e01f27d69c804ac6bc56b527b33c219':
Rollback to return density for scaleFactor.
Grace Kloba [Fri, 11 Dec 2009 21:53:22 +0000 (13:53 -0800)]
Rollback to return density for scaleFactor.
Move the comment to HTMLCanvasElement and always use 1.0 there.
Andrei Popescu [Fri, 11 Dec 2009 18:42:59 +0000 (10:42 -0800)]
am
80e68b43: Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
Merge commit '
80e68b43c3da64848db8edc7d8e8fe095888e42e' into eclair-mr2-plus-aosp
* commit '
80e68b43c3da64848db8edc7d8e8fe095888e42e':
Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
Andrei Popescu [Tue, 8 Dec 2009 18:37:43 +0000 (18:37 +0000)]
Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
Grace Kloba [Fri, 11 Dec 2009 16:44:59 +0000 (08:44 -0800)]
am
f84950ed: Merge change I6efdd453 into eclair-mr2
Merge commit '
f84950ed043a9a6a88b154b77590d15a5fc1c680' into eclair-mr2-plus-aosp
* commit '
f84950ed043a9a6a88b154b77590d15a5fc1c680':
Fix the crash in RenderTableSection for Small Screen
Android (Google) Code Review [Fri, 11 Dec 2009 16:41:57 +0000 (08:41 -0800)]
Merge change I6efdd453 into eclair-mr2
* changes:
Fix the crash in RenderTableSection for Small Screen rendering. The code path was not exercised in the Browser and the crash was triggered by the WebKit integration.
Grace Kloba [Fri, 11 Dec 2009 00:18:32 +0000 (16:18 -0800)]
Fix the crash in RenderTableSection for Small Screen
rendering. The code path was not exercised in the
Browser and the crash was triggered by the WebKit
integration.
Fix http://b/issue?id=
2285748
Mike Reed [Thu, 10 Dec 2009 21:23:21 +0000 (13:23 -0800)]
am
213584b6: Merge change I514e3218 into eclair-mr2
Merge commit '
213584b6466c1086f625ca0408b64ca225f830ad' into eclair-mr2-plus-aosp
* commit '
213584b6466c1086f625ca0408b64ca225f830ad':
add event interface for plugins, so they can post an event to themselves (from any thread)
Android (Google) Code Review [Thu, 10 Dec 2009 21:20:25 +0000 (13:20 -0800)]
Merge change I514e3218 into eclair-mr2
* changes:
add event interface for plugins, so they can post an event to themselves (from any thread)
Mike Reed [Thu, 10 Dec 2009 16:36:37 +0000 (11:36 -0500)]
add event interface for plugins, so they can post an event to themselves (from any thread)
Mike Reed [Thu, 10 Dec 2009 19:42:38 +0000 (11:42 -0800)]
am
68bffef2: fix sim build: only issue -Wno-psabi if we building for arm
Merge commit '
68bffef21d27be83106b900b71fe109b341d7d71' into eclair-mr2-plus-aosp
* commit '
68bffef21d27be83106b900b71fe109b341d7d71':
fix sim build: only issue -Wno-psabi if we building for arm
Mike Reed [Thu, 10 Dec 2009 19:31:40 +0000 (14:31 -0500)]
fix sim build: only issue -Wno-psabi if we building for arm
Mike Reed [Thu, 10 Dec 2009 19:00:05 +0000 (11:00 -0800)]
am
c1d0b386: remove 100s of warnings about va_list mangling in GCC 4.4
Merge commit '
c1d0b3861ca3935f97e55a77d7b45205df988be2' into eclair-mr2-plus-aosp
* commit '
c1d0b3861ca3935f97e55a77d7b45205df988be2':
remove 100s of warnings about va_list mangling in GCC 4.4
Mike Reed [Thu, 10 Dec 2009 16:35:25 +0000 (11:35 -0500)]
remove 100s of warnings about va_list mangling in GCC 4.4
On branch warning
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: Android.mk
Steve Block [Thu, 10 Dec 2009 11:35:00 +0000 (03:35 -0800)]
am
ef7c23d3: Merge change Ice11d745 into eclair-mr2
Merge commit '
ef7c23d3a074f2d7458b0102f20d2219c8559736' into eclair-mr2-plus-aosp
* commit '
ef7c23d3a074f2d7458b0102f20d2219c8559736':
Removes superfluous SocketStreamHandleBase.cpp from Android build.
Android (Google) Code Review [Thu, 10 Dec 2009 11:31:00 +0000 (03:31 -0800)]
Merge change Ice11d745 into eclair-mr2
* changes:
Removes superfluous SocketStreamHandleBase.cpp from Android build.
Steve Block [Wed, 9 Dec 2009 16:09:31 +0000 (16:09 +0000)]
Removes superfluous SocketStreamHandleBase.cpp from Android build.
Change-Id: Ice11d7459e425b18f07b77527aa71696c880ae77
Patrick Scott [Thu, 10 Dec 2009 00:01:10 +0000 (16:01 -0800)]
am
4c603120: Merge change I85087ab0 into eclair-mr2
Merge commit '
4c60312020a74a5176fd86b0552720ac8f6121ba' into eclair-mr2-plus-aosp
* commit '
4c60312020a74a5176fd86b0552720ac8f6121ba':
Enable orientation events.
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 [Wed, 9 Dec 2009 23:59:35 +0000 (15:59 -0800)]
am
bf16ddc1: Pass a message to move the focus when user hits "Next".
Merge commit '
bf16ddc110ef3fde2cfa1ae43ab31d993377981d' into eclair-mr2-plus-aosp
* commit '
bf16ddc110ef3fde2cfa1ae43ab31d993377981d':
Pass a message to move the focus when user hits "Next".
Patrick Scott [Wed, 9 Dec 2009 23:59:21 +0000 (15:59 -0800)]
am
17c1a14b: Merge change I85893753 into eclair-mr2
Merge commit '
17c1a14b2505f0733de3526a49ce1e12a2eb8b37' into eclair-mr2-plus-aosp
* commit '
17c1a14b2505f0733de3526a49ce1e12a2eb8b37':
Pull down change 51321 from webkit.org.
Mike Reed [Wed, 9 Dec 2009 23:49:12 +0000 (15:49 -0800)]
am
272b2e99: use twopoint gradients
Merge commit '
272b2e99702f8b2ef167a06dd77bc52122d9dd1c' into eclair-mr2-plus-aosp
* commit '
272b2e99702f8b2ef167a06dd77bc52122d9dd1c':
use twopoint gradients
Grace Kloba [Wed, 9 Dec 2009 23:46:59 +0000 (15:46 -0800)]
am
c0e0daab: Merge change I0b9d36d9 into eclair-mr2
Merge commit '
c0e0daaba9824f379ec50a976f8b48f0d6ad9317' into eclair-mr2-plus-aosp
* commit '
c0e0daaba9824f379ec50a976f8b48f0d6ad9317':
Modify AndroidWebHistoryBridge to prepare uploading
Leon Scroggins [Wed, 9 Dec 2009 23:45:02 +0000 (15:45 -0800)]
am
91a3bec8: Show "Go" for the last textfield in a form.
Merge commit '
91a3bec8a1f1a64c6e1ca755766988b4fd6bf41a' into eclair-mr2-plus-aosp
* commit '
91a3bec8a1f1a64c6e1ca755766988b4fd6bf41a':
Show "Go" for the last textfield in a form.
Cary Clark [Wed, 9 Dec 2009 23:44:56 +0000 (15:44 -0800)]
am
44c05fb6: exclude from cache nodes that are entirely clipped out
Merge commit '
44c05fb68509c9d10a2e780c05a77a4d9f78124f' into eclair-mr2-plus-aosp
* commit '
44c05fb68509c9d10a2e780c05a77a4d9f78124f':
exclude from cache nodes that are entirely clipped out
Cary Clark [Wed, 9 Dec 2009 23:44:50 +0000 (15:44 -0800)]
am
4cf840fc: Merge change Ia8a49e0d into eclair-mr2
Merge commit '
4cf840fc0046a79568cb800af5d85d529c1411b2' into eclair-mr2-plus-aosp
* commit '
4cf840fc0046a79568cb800af5d85d529c1411b2':
fix debugging output
Derek Sollenberger [Wed, 9 Dec 2009 23:44:37 +0000 (15:44 -0800)]
am
dcab27c3: Switching from activity based full screen plugins to a view system overlay.
Merge commit '
dcab27c390251a3b534b8eeb1fa5b8301686b1ab' into eclair-mr2-plus-aosp
* commit '
dcab27c390251a3b534b8eeb1fa5b8301686b1ab':
Switching from activity based full screen plugins to a view system overlay.
Ben Murdoch [Wed, 9 Dec 2009 23:44:03 +0000 (15:44 -0800)]
am
168aa9a1: Merge change I747854ee into eclair-mr2
Merge commit '
168aa9a1c8da72a4929e086ad8d65555be0ef184' into eclair-mr2-plus-aosp
* commit '
168aa9a1c8da72a4929e086ad8d65555be0ef184':
Remove an accidentally added include.
Steve Block [Wed, 9 Dec 2009 23:43:55 +0000 (15:43 -0800)]
am
bfe6eebb: Merge change I640d5ca9 into eclair-mr2
Merge commit '
bfe6eebb3416ce4745bb79739e718382cb75e41b' into eclair-mr2-plus-aosp
* commit '
bfe6eebb3416ce4745bb79739e718382cb75e41b':
Merges V8 version of jni_utility with JSC version at WebCore/bridge/jni.
Android (Google) Code Review [Wed, 9 Dec 2009 19:30:03 +0000 (11:30 -0800)]
Merge change I85087ab0 into eclair-mr2
* changes:
Enable orientation events.
Grace Kloba [Tue, 8 Dec 2009 17:50:32 +0000 (09:50 -0800)]
Enable longpress and doubletap to WebKit as touch
event if it is requested.
Patrick Scott [Wed, 2 Dec 2009 13:32:13 +0000 (08:32 -0500)]
Enable orientation events.
Remove our old orientation hacks as webkit now supports the orientation event.
Call down into webkit when the orientation changes to send the js event.
The change to Frame.cpp has been submited to bugs.webkit.org as issue 32321.
Leon Scroggins [Tue, 8 Dec 2009 21:59:46 +0000 (16:59 -0500)]
Pass a message to move the focus when user hits "Next".
Directly move the focus rather than passing a click.
Fixes http://b/issue?id=
2292683
Requires a change to frameworks/base
Android (Google) Code Review [Wed, 9 Dec 2009 14:11:13 +0000 (06:11 -0800)]
Merge change I85893753 into eclair-mr2
* changes:
Pull down change 51321 from webkit.org.
Patrick Scott [Wed, 9 Dec 2009 13:56:19 +0000 (08:56 -0500)]
Pull down change 51321 from webkit.org.
Calls to EventNames() was causing multiple copies of the event names to be
created. This could cause false negatives in hash map lookups.
Mike Reed [Tue, 8 Dec 2009 19:15:05 +0000 (14:15 -0500)]
use twopoint gradients
Android (Google) Code Review [Tue, 8 Dec 2009 17:45:22 +0000 (09:45 -0800)]
Merge change I0b9d36d9 into eclair-mr2
* changes:
Modify AndroidWebHistoryBridge to prepare uploading detachHistoryItem() to WebKit.
Leon Scroggins [Mon, 7 Dec 2009 21:54:56 +0000 (16:54 -0500)]
Show "Go" for the last textfield in a form.
Fixes http://b/issue?id=
2210152
Cary Clark [Tue, 8 Dec 2009 15:00:36 +0000 (10:00 -0500)]
exclude from cache nodes that are entirely clipped out
Google's real time search has many results outside of an overflow
div that should be ignored by the nav cache. Make it so.
fixes http://b/
2298478
Android (Google) Code Review [Tue, 8 Dec 2009 14:59:01 +0000 (06:59 -0800)]
Merge change Ia8a49e0d into eclair-mr2
* changes:
fix debugging output
Derek Sollenberger [Mon, 7 Dec 2009 21:18:43 +0000 (16:18 -0500)]
Switching from activity based full screen plugins to a view system overlay.
Android (Google) Code Review [Tue, 8 Dec 2009 12:37:02 +0000 (04:37 -0800)]
Merge change I747854ee into eclair-mr2
* changes:
Remove an accidentally added include.
Android (Google) Code Review [Tue, 8 Dec 2009 11:48:26 +0000 (03:48 -0800)]
Merge change I640d5ca9 into eclair-mr2
* changes:
Merges V8 version of jni_utility with JSC version at WebCore/bridge/jni.
Grace Kloba [Mon, 7 Dec 2009 22:27:17 +0000 (14:27 -0800)]
Modify AndroidWebHistoryBridge to prepare uploading
detachHistoryItem() to WebKit.
I think it is easy to read this way that the constructor
sets the m_historyItem and the new method will detach it.
Cary Clark [Mon, 7 Dec 2009 22:09:30 +0000 (17:09 -0500)]
fix debugging output
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>
Ben Murdoch [Mon, 7 Dec 2009 15:29:26 +0000 (15:29 +0000)]
Remove an accidentally added include.
Change-Id: I747854ee918df97d12d7d0ed1a5fecfb10d8d805
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 [Mon, 7 Dec 2009 12:05:28 +0000 (12:05 +0000)]
Merges V8 version of jni_utility with JSC version at WebCore/bridge/jni.
Change-Id: I640d5ca9e38d78fd662550fa389cf8b463dc78b6
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: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: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
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: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