OSDN Git Service
Nicolas Roard [Mon, 4 Jan 2010 19:41:10 +0000 (11:41 -0800)]
am
9acd586e: webkit layers support
Merge commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72' into eclair-mr2-plus-aosp
* commit '
9acd586e4a0aa54e4f630665aa0d3c8c95b78e72':
webkit layers support
Nicolas Roard [Mon, 4 Jan 2010 19:33:17 +0000 (19:33 +0000)]
webkit layers support
Leon Scroggins [Mon, 4 Jan 2010 15:33:11 +0000 (07:33 -0800)]
am
5bd553b6: Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Merge commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f' into eclair-mr2-plus-aosp
* commit '
5bd553b63661fa0f711bb9c02566d5df80a9432f':
If the DOM changes textfield focus, make the IME work properly.
Steve Block [Mon, 4 Jan 2010 15:31:12 +0000 (07:31 -0800)]
am
edb4aa51: Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Merge commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0' into eclair-mr2-plus-aosp
* commit '
edb4aa515ddaa7a5832d7c2896cb0ed9f7dcbbf0':
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
Leon Scroggins [Mon, 4 Jan 2010 15:27:55 +0000 (07:27 -0800)]
Merge "If the DOM changes textfield focus, make the IME work properly." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 15:20:25 +0000 (07:20 -0800)]
Merge "Cherry-picks a WebKit change to revert recent changes to String addition for JSC." into eclair-mr2
Steve Block [Mon, 4 Jan 2010 12:50:03 +0000 (12:50 +0000)]
Cherry-picks a WebKit change to revert recent changes to String addition for JSC.
WebKit change http://trac.webkit.org/changeset/51975 modified String addition in
JSC to use ropes. However, the change was incorrect, so was rolled back in
http://trac.webkit.org/changeset/51978.
The last WebKit merge was to revision r51976, so picked up the initial, broken
change only.
This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the
original change.
Bug:
2336856
Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
Leon Scroggins [Tue, 15 Dec 2009 21:33:28 +0000 (16:33 -0500)]
If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=
2219166
Requires a change to frameworks/base
Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events. Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing. Also, allow "Next" to work on the currently focused
textfield, even if it's not the cursor. Further, check for
a new action if there is a focus but not a cursor.
Derek Sollenberger [Fri, 18 Dec 2009 16:49:14 +0000 (08:49 -0800)]
am
626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '
626f2058a8302d9e9770d3df2f9677344adb02d9' into eclair-mr2-plus-aosp
* commit '
626f2058a8302d9e9770d3df2f9677344adb02d9':
Fix to ensure plugin is notified even when the screen width does not change.
Android (Google) Code Review [Fri, 18 Dec 2009 16:46:32 +0000 (08:46 -0800)]
Merge change Iab49f046 into eclair-mr2
* changes:
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 14:44:02 +0000 (06:44 -0800)]
am
84a47995: Merge change I21d39461 into eclair-mr2
Merge commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3' into eclair-mr2-plus-aosp
* commit '
84a4799558b021d8ab6c19a7fa787e2731aa1fe3':
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Android (Google) Code Review [Fri, 18 Dec 2009 14:41:41 +0000 (06:41 -0800)]
Merge change I21d39461 into eclair-mr2
* changes:
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Derek Sollenberger [Fri, 18 Dec 2009 14:01:01 +0000 (09:01 -0500)]
Fix to ensure plugin is notified even when the screen width does not change.
Steve Block [Fri, 18 Dec 2009 12:22:36 +0000 (12:22 +0000)]
Adds a 'using namespace JSC::Bindings;' declaration in WebCoreFrameBridge.
Also fixes some style issues.
Change-Id: I21d39461b488a5f490ea3557b24fe1674903c286
Steve Block [Fri, 18 Dec 2009 10:15:04 +0000 (02:15 -0800)]
am
6c4eb7eb: Merge change I49687314 into eclair-mr2
Merge commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6' into eclair-mr2-plus-aosp
* commit '
6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6':
Fixes a Geolocation bug with cached positions.
Android (Google) Code Review [Fri, 18 Dec 2009 10:11:06 +0000 (02:11 -0800)]
Merge change I49687314 into eclair-mr2
* changes:
Fixes a Geolocation bug with cached positions.
Steve Block [Thu, 17 Dec 2009 18:18:00 +0000 (10:18 -0800)]
am
2fb528f4: Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Merge commit '
2fb528f4cf4b88d350947cec509672a40d1aa9fb' into eclair-mr2-plus-aosp
* commit '
2fb528f4cf4b88d350947cec509672a40d1aa9fb':
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Steve Block [Tue, 15 Dec 2009 15:45:02 +0000 (15:45 +0000)]
Adds notes to upstream feature guards added in V8DOMWrapper.cpp.
Change-Id: Id7659cfcab17f24e48958086b4206b1906562d74
Steve Block [Wed, 16 Dec 2009 12:57:38 +0000 (12:57 +0000)]
Fixes a Geolocation bug with cached positions.
In the case where a watch request returns a cached position, we must clear the cached position to prevent it from being used repeatedly in the case where the watch timer later fires.
Also cleans up some code and adds some comments.
This will be upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=30676
Change-Id: I4968731453c3dfd34a8d3466fdaee91d4c4158be
Steve Block [Thu, 17 Dec 2009 17:57:05 +0000 (09:57 -0800)]
am
7a747c0b: Merge webkit.org at r51976 : Update WebKit revision number.
Merge commit '
7a747c0b98a39b08f04bfbf16595228a6c841541' into eclair-mr2-plus-aosp
* commit '
7a747c0b98a39b08f04bfbf16595228a6c841541':
Merge webkit.org at r51976 : Update WebKit revision number.
Steve Block [Thu, 17 Dec 2009 17:57:01 +0000 (09:57 -0800)]
am
dda7a494: Merge webkit.org at r51976 : ColorSpace type has been removed.
Merge commit '
dda7a4941593717cc8e59c2e1a54ff00dfe5af0f' into eclair-mr2-plus-aosp
* commit '
dda7a4941593717cc8e59c2e1a54ff00dfe5af0f':
Merge webkit.org at r51976 : ColorSpace type has been removed.
Steve Block [Thu, 17 Dec 2009 17:56:56 +0000 (09:56 -0800)]
am
9d4fbac1: Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Merge commit '
9d4fbac1fe10b33df5e73efeb171454603ac8cf3' into eclair-mr2-plus-aosp
* commit '
9d4fbac1fe10b33df5e73efeb171454603ac8cf3':
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
Steve Block [Thu, 17 Dec 2009 17:56:52 +0000 (09:56 -0800)]
am
02f7edff: Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Merge commit '
02f7edff6c1625ed75eaf447e02ef659e62e3a10' into eclair-mr2-plus-aosp
* commit '
02f7edff6c1625ed75eaf447e02ef659e62e3a10':
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
Steve Block [Thu, 17 Dec 2009 17:56:47 +0000 (09:56 -0800)]
am
81d7a8e2: Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Merge commit '
81d7a8e20f14dc502cc38f8d654adf1334a2833c' into eclair-mr2-plus-aosp
* commit '
81d7a8e20f14dc502cc38f8d654adf1334a2833c':
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
Steve Block [Thu, 17 Dec 2009 17:56:42 +0000 (09:56 -0800)]
am
888fd09c: Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Merge commit '
888fd09c906f3c3a24a303a859c4c5adc04643f4' into eclair-mr2-plus-aosp
* commit '
888fd09c906f3c3a24a303a859c4c5adc04643f4':
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
Steve Block [Thu, 17 Dec 2009 17:56:36 +0000 (09:56 -0800)]
am
2c3e1d02: Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Merge commit '
2c3e1d0284b92aad4ad3eba7505574bba9770080' into eclair-mr2-plus-aosp
* commit '
2c3e1d0284b92aad4ad3eba7505574bba9770080':
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
Steve Block [Thu, 17 Dec 2009 17:56:30 +0000 (09:56 -0800)]
am
f94c6846: Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Merge commit '
f94c68461da450895b1f8dc388861cb764565bb5' into eclair-mr2-plus-aosp
* commit '
f94c68461da450895b1f8dc388861cb764565bb5':
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
Steve Block [Thu, 17 Dec 2009 17:56:24 +0000 (09:56 -0800)]
am
0f41711d: Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Merge commit '
0f41711d127b039d940c02f98f2d48433880e8f7' into eclair-mr2-plus-aosp
* commit '
0f41711d127b039d940c02f98f2d48433880e8f7':
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
Steve Block [Thu, 17 Dec 2009 17:56:17 +0000 (09:56 -0800)]
am
4e46c2c1: Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Merge commit '
4e46c2c16f454c6652d32889814f25a5fbb3bf28' into eclair-mr2-plus-aosp
* commit '
4e46c2c16f454c6652d32889814f25a5fbb3bf28':
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
Steve Block [Thu, 17 Dec 2009 17:56:09 +0000 (09:56 -0800)]
am
6a011ab8: Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Merge commit '
6a011ab807deb276b9924d501a4219542092958c' into eclair-mr2-plus-aosp
* commit '
6a011ab807deb276b9924d501a4219542092958c':
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
Steve Block [Thu, 17 Dec 2009 17:56:02 +0000 (09:56 -0800)]
am
031c32d2: Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Merge commit '
031c32d25a37eec52b946918d7648750f8e59a1f' into eclair-mr2-plus-aosp
* commit '
031c32d25a37eec52b946918d7648750f8e59a1f':
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
Steve Block [Thu, 17 Dec 2009 17:55:54 +0000 (09:55 -0800)]
am
d5340bbd: Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Merge commit '
d5340bbd847b3fabb04f28f1aa8425f1874b0bb3' into eclair-mr2-plus-aosp
* commit '
d5340bbd847b3fabb04f28f1aa8425f1874b0bb3':
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
Steve Block [Thu, 17 Dec 2009 17:55:45 +0000 (09:55 -0800)]
am
c351226d: Merge webkit.org at r51976 : Changes to InspectorController.
Merge commit '
c351226de9a0ca9d369e44537f6c9ad6606bd219' into eclair-mr2-plus-aosp
* commit '
c351226de9a0ca9d369e44537f6c9ad6606bd219':
Merge webkit.org at r51976 : Changes to InspectorController.
Steve Block [Thu, 17 Dec 2009 17:55:36 +0000 (09:55 -0800)]
am
7857d371: Merge webkit.org at r51976 : Fix Makefiles.
Merge commit '
7857d3718de9ebd025de4cfd7c8b0e78af4ea21b' into eclair-mr2-plus-aosp
* commit '
7857d3718de9ebd025de4cfd7c8b0e78af4ea21b':
Merge webkit.org at r51976 : Fix Makefiles.
Steve Block [Thu, 17 Dec 2009 17:55:28 +0000 (09:55 -0800)]
am
aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '
aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit '
aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
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 [Wed, 25 Nov 2009 18:46:40 +0000 (18:46 +0000)]
Merge webkit.org at r51976 : Update WebKit revision number.
Change-Id: I71ebb1ee90bbca9328a3c6ca30f0beaefebbede2
Steve Block [Thu, 26 Nov 2009 14:10:10 +0000 (14:10 +0000)]
Merge webkit.org at r51976 : ColorSpace type has been removed.
See the following WebKit changes ...
http://trac.webkit.org/changeset/50614
http://trac.webkit.org/changeset/51124
http://trac.webkit.org/changeset/51161
Change-Id: I690bb3aebc75b5a45396bb9bbcc4ee797ca3465b
Steve Block [Thu, 26 Nov 2009 16:08:52 +0000 (16:08 +0000)]
Merge webkit.org at r51976 : GraphicsContext::setPlatformShadow now takes a ColorSpace argument.
See http://trac.webkit.org/changeset/50852
Change-Id: Ie6ddbe8da1ce7bc2dffbd57bb93aee5d5e9a1068
Steve Block [Wed, 9 Dec 2009 16:48:47 +0000 (16:48 +0000)]
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
See http://trac.webkit.org/changeset/51801
Change-Id: I819c17c8609dd65799bd8a2245cc454e27271969
Steve Block [Wed, 9 Dec 2009 15:40:02 +0000 (15:40 +0000)]
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
See http://trac.webkit.org/changeset/51212
Change-Id: I276253611ffe7518733fc7af51b0dfcc5f5d8691
Steve Block [Thu, 26 Nov 2009 21:00:59 +0000 (21:00 +0000)]
Merge webkit.org at r51976 : V8Proxy::sourceName now returns bool.
See http://trac.webkit.org/changeset/50327
Change-Id: If8461f4f433a8addac9cd593f5f66571399a31bb
Steve Block [Wed, 9 Dec 2009 15:19:26 +0000 (15:19 +0000)]
Merge webkit.org at r51976 : externalRepresentation now takes a Frame argument.
See http://trac.webkit.org/changeset/50923
Change-Id: I8c7bb8af6e40fd449e27f28ff0d2e58fbb4d9eb3
Steve Block [Thu, 26 Nov 2009 14:21:22 +0000 (14:21 +0000)]
Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.
See http://trac.webkit.org/changeset/50760
Change-Id: I50c0864b1347e81839b8276a832311d7d1281148
Steve Block [Thu, 26 Nov 2009 13:10:36 +0000 (13:10 +0000)]
Merge webkit.org at r51976 : Icon::createIconForFile has been removed.
See http://trac.webkit.org/changeset/50632
Change-Id: I3b10aff021d89b66d4d3d5f52773e4922654fbfa
Steve Block [Wed, 9 Dec 2009 15:16:27 +0000 (15:16 +0000)]
Merge webkit.org at r51976 : Geolocation error code UNKNOWN_ERROR is deprecated.
See http://trac.webkit.org/changeset/50605
Change-Id: Iaad2055f169f56b7d43e2e3195041f0796506092
Steve Block [Wed, 9 Dec 2009 15:01:27 +0000 (15:01 +0000)]
Merge webkit.org at r51976 : Implement new FrameLoaderClient page state methods.
See http://trac.webkit.org/changeset/51644
Change-Id: I539af311723c20648d4958c46ee3ebe502e680b8
Steve Block [Wed, 9 Dec 2009 14:47:50 +0000 (14:47 +0000)]
Merge webkit.org at r51976 : FrameLoaderClient::windowObjectCleared has been replaced with dispatchDidClearWindowObjectInWorld.
See http://trac.webkit.org/changeset/50973
Change-Id: I54093cd917f15a51412b07b5495f32502cfd23b5
Steve Block [Wed, 9 Dec 2009 14:40:12 +0000 (14:40 +0000)]
Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.
See http://trac.webkit.org/changeset/50351
Change-Id: Ia3fa68ebb7f54b3a88635c9e8ebade0180a62e21
Steve Block [Wed, 9 Dec 2009 14:36:06 +0000 (14:36 +0000)]
Merge webkit.org at r51976 : Changes to InspectorController.
See http://trac.webkit.org/changeset/51631
Change-Id: Ic0973105e04df1023d4df6f6e1d20052e869ac4a
Steve Block [Thu, 26 Nov 2009 12:12:20 +0000 (12:12 +0000)]
Merge webkit.org at r51976 : Fix Makefiles.
Change-Id: I7d9d5788efda1d0e985242ab03c8016069798acd
Steve Block [Tue, 15 Dec 2009 11:15:20 +0000 (11:15 +0000)]
Merge webkit.org at r51976 : Fix general conflicts.
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
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.