OSDN Git Service
Leon Scroggins [Fri, 5 Mar 2010 16:39:01 +0000 (11:39 -0500)]
Set the proper frame's focus controller to active and focused.
When editing text, set the FocusController to both active and
focused, and use the FocusController associated with the focus.
Fixes http://b/issue?id=
2251399
Steve Block [Fri, 5 Mar 2010 18:29:52 +0000 (10:29 -0800)]
Merge "Fixes a leaked JNI local reference in MIMETypeRegistry::getMIMETypeForExtension"
Steve Block [Thu, 4 Mar 2010 16:37:50 +0000 (16:37 +0000)]
Fixes a leaked JNI local reference in MIMETypeRegistry::getMIMETypeForExtension
This method was leaking a Java class object. This caused layout test
fast/dom/prototype-inheritance-2.html to crash because the VM ran out of local
references.
Bug:
2218794
Change-Id: I15d6bb8bf16ec58ecd6470ef63e6cd3635d766ef
Andrei Popescu [Fri, 5 Mar 2010 18:02:54 +0000 (10:02 -0800)]
Merge "Remove unnecessary call to ChromeClientAndroid::scheduleCompositingLayerSync()."
Andrei Popescu [Fri, 5 Mar 2010 16:26:29 +0000 (16:26 +0000)]
Remove unnecessary call to ChromeClientAndroid::scheduleCompositingLayerSync().
Fix b:
2471383
Patrick Scott [Fri, 5 Mar 2010 16:18:06 +0000 (08:18 -0800)]
Merge "Fix history restore."
Cary Clark [Fri, 5 Mar 2010 15:29:58 +0000 (07:29 -0800)]
Merge "forgot header file ; broke build in 43447"
Cary Clark [Fri, 5 Mar 2010 15:28:17 +0000 (10:28 -0500)]
forgot header file ; broke build in 43447
Cary Clark [Fri, 5 Mar 2010 15:06:09 +0000 (07:06 -0800)]
Merge "fixes with find drawing in layers"
Cary Clark [Fri, 5 Mar 2010 14:29:34 +0000 (09:29 -0500)]
fixes with find drawing in layers
Clipping the match picture before drawing prevents layer
pictures from drawing outside of their intended bounds.
Rearranging the layer picture draw call causes it to restore
the canvas matrix, which causes extras like finds and cursor
rings to draw correctly.
Also, added more layer debugging, and a function to show
layer state in the console window.
http://b/
2488516
http://b/
2488509
Patrick Scott [Thu, 4 Mar 2010 21:15:43 +0000 (16:15 -0500)]
Fix history restore.
goToItem now does a lot of what we were doing and was causing the page to not
load because the current item matched where we were trying to move.
Patrick Scott [Thu, 4 Mar 2010 16:20:19 +0000 (08:20 -0800)]
Merge "Use the complete url when blocking images."
Mike Reed [Thu, 4 Mar 2010 14:10:31 +0000 (06:10 -0800)]
Merge "disable visiblerect debugging printfs"
Mike Reed [Thu, 4 Mar 2010 14:09:41 +0000 (09:09 -0500)]
disable visiblerect debugging printfs
Patrick Scott [Thu, 4 Mar 2010 12:54:25 +0000 (07:54 -0500)]
Use the complete url when blocking images.
Image urls that are relative to a base url need to be resolved before looking at
the scheme.
Bug:
2455482
Leon Clarke [Tue, 23 Feb 2010 10:17:11 +0000 (10:17 +0000)]
Don't leak global weak references when running layout tests
Jean-Baptiste Queru [Wed, 3 Mar 2010 22:53:45 +0000 (14:53 -0800)]
am
fa65eb8a: (-s ours) am
9a77bf56: Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
Merge commit '
fa65eb8a4fe0c48e4c8630850b2492051e5adf5a'
* commit '
fa65eb8a4fe0c48e4c8630850b2492051e5adf5a':
Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
Jean-Baptiste Queru [Wed, 3 Mar 2010 22:49:33 +0000 (14:49 -0800)]
am
9a77bf56: Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
Merge commit '
9a77bf563cbe404d041d0df3530cb57ae67013aa' into eclair-mr2-plus-aosp
* commit '
9a77bf563cbe404d041d0df3530cb57ae67013aa':
Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
Jean-Baptiste Queru [Wed, 3 Mar 2010 22:27:34 +0000 (14:27 -0800)]
Revert "Use STLPort instead of our stripped version." DO NOT MERGE.
This reverts commit
f0073a99fda2bf1acd49fa66d0dd4272d09a1e61.
Jean-Baptiste Queru [Wed, 3 Mar 2010 21:51:21 +0000 (13:51 -0800)]
am
381c572c: (-s ours) am
f0073a99: Use STLPort instead of our stripped version. DO NOT MERGE.
Merge commit '
381c572c6f77708151c42fbda8c8c1ed8e67c9c5'
* commit '
381c572c6f77708151c42fbda8c8c1ed8e67c9c5':
Use STLPort instead of our stripped version. DO NOT MERGE.
Claire Ho [Wed, 3 Mar 2010 21:51:18 +0000 (13:51 -0800)]
am
dd77efd5: (-s ours) am
60326ce1: Android ICU4.2.1 upgrade. DO NOT MERGE. Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid compiler error.
Merge commit '
dd77efd5572bacfcd92fc815484a87297403a20d'
* commit '
dd77efd5572bacfcd92fc815484a87297403a20d':
Android ICU4.2.1 upgrade. DO NOT MERGE.
Jean-Baptiste Queru [Wed, 3 Mar 2010 21:40:16 +0000 (13:40 -0800)]
am
f0073a99: Use STLPort instead of our stripped version. DO NOT MERGE.
Merge commit '
f0073a99fda2bf1acd49fa66d0dd4272d09a1e61' into eclair-mr2-plus-aosp
* commit '
f0073a99fda2bf1acd49fa66d0dd4272d09a1e61':
Use STLPort instead of our stripped version. DO NOT MERGE.
Jean-Baptiste Queru [Wed, 3 Mar 2010 21:08:11 +0000 (13:08 -0800)]
Use STLPort instead of our stripped version. DO NOT MERGE.
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.
Cary Clark [Wed, 3 Mar 2010 20:48:58 +0000 (12:48 -0800)]
Merge "stop parsing text for addresses if input element is found"
Cary Clark [Wed, 3 Mar 2010 20:41:45 +0000 (15:41 -0500)]
stop parsing text for addresses if input element is found
http://b/
2420076
Mike Reed [Wed, 3 Mar 2010 20:38:38 +0000 (12:38 -0800)]
Merge "add optional preftable to image codecs, for more control over the resulting bitmap config"
Patrick Scott [Wed, 3 Mar 2010 20:24:51 +0000 (12:24 -0800)]
Merge "Call setCurrentIndex to trigger the client callback."
Patrick Scott [Wed, 3 Mar 2010 20:18:19 +0000 (15:18 -0500)]
Call setCurrentIndex to trigger the client callback.
Patrick Scott [Wed, 3 Mar 2010 19:05:39 +0000 (11:05 -0800)]
Merge "Revive my change to not add anchor navigations to the history in some cases."
Mike Reed [Wed, 3 Mar 2010 18:25:57 +0000 (13:25 -0500)]
add optional preftable to image codecs, for more control over the resulting bitmap config
http://b/issue?id=
2267010
Steve Block [Wed, 3 Mar 2010 18:54:53 +0000 (10:54 -0800)]
Merge "Adds Android-specific expected results for some storage LayoutTests when using V8"
Claire Ho [Wed, 3 Mar 2010 18:51:53 +0000 (10:51 -0800)]
am
60326ce1: Android ICU4.2.1 upgrade. DO NOT MERGE. Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid compiler error.
Merge commit '
60326ce181ad373e08112435e159a9c71f85a08e' into eclair-mr2-plus-aosp
* commit '
60326ce181ad373e08112435e159a9c71f85a08e':
Android ICU4.2.1 upgrade. DO NOT MERGE.
Andrei Popescu [Wed, 3 Mar 2010 18:46:13 +0000 (18:46 +0000)]
fix build
Andrei Popescu [Wed, 3 Mar 2010 18:41:52 +0000 (10:41 -0800)]
Merge "Fix V8 build when instrumentation is on"
Andrei Popescu [Wed, 3 Mar 2010 18:16:12 +0000 (18:16 +0000)]
Fix V8 build when instrumentation is on
Claire Ho [Tue, 24 Nov 2009 22:03:26 +0000 (14:03 -0800)]
Android ICU4.2.1 upgrade. DO NOT MERGE.
Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid
compiler error.
Bug:
1823720
Reviewed-by: benm@google.com,enh@google.com
CC:
Signed-off-by:
Steve Block [Wed, 3 Mar 2010 17:52:00 +0000 (09:52 -0800)]
Merge "Fixes a crash in WeakJavaInstance"
Patrick Scott [Wed, 3 Mar 2010 17:10:51 +0000 (12:10 -0500)]
Revive my change to not add anchor navigations to the history in some cases.
Do not add history items when there is an anchor navigation if the user did not
initiate the event.
We backed out this change because cnn.com fixed itself but now
app.showtime-app.com does the same trick and prevents the Browser from being
able to go back.
Steve Block [Wed, 3 Mar 2010 16:54:11 +0000 (16:54 +0000)]
Fixes a crash in WeakJavaInstance
WeakJavaInstance is a wrapper around JavaInstance. Outside of calls to
virtualBegin/virtualEnd, it replaces the strong reference to the Java instance
held by JavaInstance with a weak reference. This is to break circular references
and allow the Java instance to be garbage collected.
The code does not handle correctly the case where multiple calls are made to
virtualBegin before corresponding calls to virtualEnd. virtualBegin caches the
current instance as _weakRef. However, if virtualBegin has already been called,
the current instance is now a strong reference, and this overwrites _weakRef.
When virtualEnd is called, the instance is not restored to the weak reference. In
the WeakJavaInstance destructor, we try to restore the strong reference from the
weak reference, but this has already been deleted, causing the VM to abort.
This patch fixes the problem by returning early from virtualBegin and virtualEnd
when unmatched calls to virtualBegin have already been made.
Also fixes some style issues.
Bug:
2485164
Change-Id: I2b22a849af10e377525a3da215ca91e611d892d0
Cary Clark [Wed, 3 Mar 2010 13:35:20 +0000 (08:35 -0500)]
refactor find state and scrolling
Separate out state when find is up and is empty.
Request a scroll when setting a match, rather than when drawing.
Don't draw if there's no match.
Companion fix in frameworks/base
http://b/
2370069
Mike Reed [Wed, 3 Mar 2010 14:28:03 +0000 (09:28 -0500)]
bump up our image cache etc. when we're on larger devices (e.g. have VFP)
fixes http://b/issue?id=
2236822
Derek Sollenberger [Tue, 2 Mar 2010 16:08:48 +0000 (11:08 -0500)]
fixing problem were plugin surfaces are not created.
The problem occurs when a page containing a plugin is refreshed
or the plugin is loaded using javascript. If the window size
is set before the plugin view has its parent sent then the
plugin surfaces were not being initialized. This change ensures
that if that happens the surfaces will still be created.
see bug #
2476059.
Cary Clark [Mon, 1 Mar 2010 14:24:38 +0000 (09:24 -0500)]
allow anchor containing layer to be mapped to navable layer
A layer may be inside or outside of an anchor. If it is inside,
the corresponding CachedNode has already been created, but is
being tracked. These tracked nodes need their layer and unclipped
bits set. For now, node in layers are assumed to draw last in
their layer, and aren't obscured by other drawing.
We may allow nodes in layers to be obscured one day. Preparing
for that, translate the layer picture by its global position
when testing to see if the node is hidden.
Fix debugging by allowing CachedLayer to see inside LayerAndroid.
http://b/
2453974
Derek Sollenberger [Tue, 2 Mar 2010 15:17:21 +0000 (07:17 -0800)]
am
4e409302: am
a506357e: Adding logging to android\'s plugin view.
Merge commit '
4e409302db5afdfb18231bd3e1a86f85302a2599'
* commit '
4e409302db5afdfb18231bd3e1a86f85302a2599':
Adding logging to android's plugin view.
Derek Sollenberger [Tue, 2 Mar 2010 15:12:40 +0000 (07:12 -0800)]
am
a506357e: Adding logging to android\'s plugin view.
Merge commit '
a506357ecbae5e506e0c3e46b6ebac632fd22328' into eclair-mr2-plus-aosp
* commit '
a506357ecbae5e506e0c3e46b6ebac632fd22328':
Adding logging to android's plugin view.
Derek Sollenberger [Tue, 2 Mar 2010 14:50:27 +0000 (09:50 -0500)]
Adding logging to android's plugin view.
Steve Block [Tue, 2 Mar 2010 00:15:52 +0000 (00:15 +0000)]
Adds Android-specific expected results for some storage LayoutTests when using V8
These expected results are mostly copied from their counterparts in LayoutTests/storage.
Minor modifications have been made to account for the different output with V8.
Change-Id: Ie606e4fbe1dd0154ef0bb643e13668966592e09c
Cary Clark [Mon, 1 Mar 2010 19:14:04 +0000 (11:14 -0800)]
Merge "use advance widths to deduce spaces in selected text"
Cary Clark [Mon, 1 Mar 2010 18:38:55 +0000 (13:38 -0500)]
use advance widths to deduce spaces in selected text
The earlier method of using bounding boxes does not work if the
characters have sufficiently large kerning, such as 'A Java' or
sufficiently small kerning, such as '16'.
Also, don't add spaces after hyphens or dashes, and detect
baseline changes correctly. Reset the first space condition once
text is clipped out.
http://b/
2457350
http://b/
2165553
Steve Block [Mon, 1 Mar 2010 18:53:35 +0000 (10:53 -0800)]
Merge "Adds Android-specific result for a Geolocation LayoutTest that fails with V8"
Leon Scroggins [Mon, 1 Mar 2010 18:16:04 +0000 (10:16 -0800)]
Merge "Make nativeMoveCursorToNextTextInput return a value based on success."
Leon Scroggins [Mon, 1 Mar 2010 16:23:47 +0000 (11:23 -0500)]
Make nativeMoveCursorToNextTextInput return a value based on success.
Also no longer differentiate between textfields and areas for the purpose
of the next action.
Part of fix for http://b/issue?id=
2478052
Requires a change to frameworks/base
Ben Murdoch [Tue, 23 Feb 2010 18:59:06 +0000 (18:59 +0000)]
The element that receives the touch event should be the target element of the touch that caused the event to be generated.
Also build the touch target list based on the target element of the touch that caused the event to be generated.
Landed to webkit as http://trac.webkit.org/changeset/55287
Change-Id: I4414b703a7b3e7c6ea6917be624ab9a7786e24a9
Ben Murdoch [Tue, 23 Feb 2010 18:26:46 +0000 (18:26 +0000)]
Update touch handler in preparation for upstreaming of m_originatingTouchTargets map. WebKit bug tracking is https://bugs.webkit.org/show_bug.cgi?id=34585
Landed to webkit as http://trac.webkit.org/changeset/55230
Change-Id: I68fa02615aec35c8c2d3e7c69e8479c33d66293c
Mike Reed [Fri, 26 Feb 2010 19:46:15 +0000 (11:46 -0800)]
Merge "ignore rootlayer when drawing (fixes regression) dump layers contents in displayTree.txt"
Mike Reed [Fri, 26 Feb 2010 19:44:28 +0000 (14:44 -0500)]
ignore rootlayer when drawing (fixes regression)
dump layers contents in displayTree.txt
Leon Clarke [Fri, 26 Feb 2010 17:32:41 +0000 (09:32 -0800)]
Merge " Don't crash when throwing javascript exceptions from plugins without javascript having been initialised."
Leon Clarke [Fri, 26 Feb 2010 17:29:17 +0000 (17:29 +0000)]
Don't crash when throwing javascript exceptions from plugins without
javascript having been initialised.
Steve Block [Fri, 26 Feb 2010 13:05:06 +0000 (05:05 -0800)]
Merge "Adds layout tests for HTML5 features"
Andrei Popescu [Fri, 26 Feb 2010 13:03:55 +0000 (05:03 -0800)]
Merge "enable debugger support in webkit with v8"
Andrei Popescu [Fri, 26 Feb 2010 12:48:03 +0000 (12:48 +0000)]
enable debugger support in webkit with v8
Mike Reed [Fri, 26 Feb 2010 12:52:29 +0000 (04:52 -0800)]
Merge "make methods private (or static local) if possible to reduce surface area of API"
Ben Murdoch [Fri, 26 Feb 2010 10:11:11 +0000 (02:11 -0800)]
Merge "Only set the DatabaseTracker path if it has been successfully set to something on the Java side as the DatabaseTracker only allows us to set it once."
Shimeng (Simon) Wang [Fri, 26 Feb 2010 01:10:31 +0000 (17:10 -0800)]
Merge "Prevent unsafe upper casting by checking Element's namespaceURI."
Mike Reed [Thu, 25 Feb 2010 22:07:06 +0000 (17:07 -0500)]
make methods private (or static local) if possible to reduce surface area of API
Shimeng (Simon) Wang [Thu, 25 Feb 2010 19:14:31 +0000 (11:14 -0800)]
Prevent unsafe upper casting by checking Element's namespaceURI.
For some website, when elements are created, somehow the tagName's
namespaceURI is empty, so for "form" element, Element node is created
instead of expected HTMLFormElement.
Bug:
2461358
modified: WebKit/android/jni/WebCoreFrameBridge.cpp
Ben Murdoch [Thu, 25 Feb 2010 18:36:43 +0000 (18:36 +0000)]
Only set the DatabaseTracker path if it has been successfully set to something on the Java side as the DatabaseTracker only
allows us to set it once.
Change-Id: I5d0121dac9a2b276a483992784822c1f52c04853
Mike Reed [Thu, 25 Feb 2010 18:27:38 +0000 (13:27 -0500)]
remove unused methods
Nicolas Roard [Thu, 25 Feb 2010 14:41:12 +0000 (14:41 +0000)]
Fix the gap when using the IME (Bug:
2453748)
The problem was that layers may have a different size than their corresponding element,
but we used the layer's size instead of the element's to compute the fixed position.
The fix asks for the element visible overflow size (needed, some children may be outside the bounds of the element itself).
Andrei Popescu [Thu, 25 Feb 2010 14:13:43 +0000 (06:13 -0800)]
Merge "Temporarily disable debugger support on V8 due to a crash"
Andrei Popescu [Thu, 25 Feb 2010 13:58:48 +0000 (13:58 +0000)]
Temporarily disable debugger support on V8 due to a crash
Cary Clark [Thu, 25 Feb 2010 13:37:40 +0000 (05:37 -0800)]
Merge "refactor drawing to support layers"
Steve Block [Thu, 25 Feb 2010 11:29:46 +0000 (11:29 +0000)]
Adds Android-specific result for a Geolocation LayoutTest that fails with V8
This is currently a false failure, as the only difference from the expected
output is due to V8's different syntax when reporting an exception.
Change-Id: If0107f730f4114f6968307a31841c9e6073dba1c
Steve Block [Thu, 25 Feb 2010 10:58:37 +0000 (10:58 +0000)]
Adds layout tests for HTML5 features
The following layout tests should all pass on Android, as they are for recently
implemented HTML5 features ...
- fast/dom/Geolocation
- storage
- http/tests/appcache
This change adds these tests to the Android tree, at the current WebKit revision
r54731. This is so that we can easily keep track of which tests should always be
green, and so that we can add Android-specific test results.
We also add the following paths ...
- fast/js/resources - used by the Geolocation tests
- http/conf - used by the Appcache tests
Tests that are currently failing are added to the DumpRenderTree skipped list
temporarily, to keep all tests green.
Change-Id: Id96c05e3746ed64e4e4c40c99567b8def688f90a
Leon Clarke [Thu, 25 Feb 2010 10:30:25 +0000 (02:30 -0800)]
Merge " Don't display our custom border round combo boxes when the stylesheet has defined one."
Shimeng (Simon) Wang [Thu, 25 Feb 2010 00:04:52 +0000 (16:04 -0800)]
Merge "Use reference instead of vector copying when dealing formElements."
Shimeng (Simon) Wang [Wed, 24 Feb 2010 23:54:38 +0000 (15:54 -0800)]
Use reference instead of vector copying when dealing formElements.
Cary Clark [Tue, 23 Feb 2010 15:46:08 +0000 (10:46 -0500)]
refactor drawing to support layers
Drawing elements that appear atop or below layers need to be
drawn both in the proper order and with the correct canvas to
respect clipping and the matrix.
Drawing the find results, text selection, or the cursor ring,
interleaves with any layers that may be drawn. The main picture
is treated as owned by a LayerAndroid so each component can
decide when to draw.
This change leave the main picture in WebViewCore.cpp, and
draws everything else in WebView.cpp -- in the future, additional
refactoring can put all drawing in one place.
The logic of what to draw is still in WebView.java, but the
actual drawing calls are now triggered inside the layer code.
Android.mk
- Add rule to trigger building without layers from buildspec.mk.
LayerAndroid.*
- Replace FindOnPage reference with abstract DrawExtra class to
draw adornments in the layers' canvas context.
- Add a LayerAndroid constructor to create a dummy layer with a
SkPicture* and a uniqueId==-1 so that extras can detect when
they are drawn by the main picture.
android_graphics.*
- Move cursor ring drawing out of WebView.cpp to here.
- Separate cursor ring setup from actual drawing.
- Get the cursor ring metrics in local coordinates.
ChromeClientAndroid.cpp
- Fix compiler warnings.
WebViewCore.*
- Move updateCursorBounds from WebView.cpp. This permits it to
be called from CursorRing::setup.
CachedFrame.*
CachedNode.*
CachedLayer.*
- Add local bounds getters.
CachedRoot.h
- Move class FindCanvas to the android namespace.
DrawExtra.h
- Add an abstract class called by LayerAndroid to optionally
draw extra elements in its canvas context.
FindCanvas.*
SelectText.*
- Refactor drawing to draw in layers context.
WebView.cpp
- Move drawing from WebView.java.
- Remove selection code to SelectText.cpp.
- Use inverseScale to simplify viewPort metrics.
- Simplify layer root so java doesn't need to know about it.
Requires companion change in frameworks/base
http://b/
2457316
http://b/
2454127
http://b/
2454149
Nicolas Roard [Wed, 24 Feb 2010 18:09:11 +0000 (18:09 +0000)]
Simplify the layer code:
* Rename setRootLayer to setUIRootLayer
* Fixed some logs in GraphicsLayerAndroid
* Added back the diagonal drawing debug code in LayerAndroid
* Simplified ChromeClientAndroid, removed compositingLayerSync()
Leon Clarke [Wed, 24 Feb 2010 19:20:21 +0000 (19:20 +0000)]
Don't display our custom border round combo boxes when the stylesheet has defined one.
Steve Block [Wed, 24 Feb 2010 18:45:35 +0000 (10:45 -0800)]
Merge "Adds a missing initializer for Geolocation maximumAge"
Steve Block [Wed, 24 Feb 2010 18:36:14 +0000 (18:36 +0000)]
Adds a missing initializer for Geolocation maximumAge
Change-Id: I7274d12baa4718280e8cc677583e5308c7917a56
Ben Murdoch [Wed, 24 Feb 2010 15:21:38 +0000 (15:21 +0000)]
Do not forward touch event types we do not support into WebCore as TouchCancel events. The old behavior creates an issue now we support pinch to zoom where releasing the pinch will always send a touch cancel to WebCore as the Java land touch event type is ACTION_POINTER_UP.
Change-Id: Ie691f4a3c5ba6a09c3838deb37d8b9e0671c835b
Nicolas Roard [Wed, 24 Feb 2010 14:00:27 +0000 (14:00 +0000)]
Re-enable the layers
Steve Block [Wed, 24 Feb 2010 11:34:12 +0000 (03:34 -0800)]
Merge "Removes repeated headers in Geolocation.cpp"
Steve Block [Wed, 24 Feb 2010 11:06:07 +0000 (11:06 +0000)]
Removes repeated headers in Geolocation.cpp
These were erroneously added in a previous WebKit merge.
See https://android-git.corp.google.com/g/#change,39242
Change-Id: I192911ec35d7447ae3933cf4903aacd2ab202a3a
Derek Sollenberger [Wed, 24 Feb 2010 03:56:04 +0000 (19:56 -0800)]
am
70a336f2: am
da8d052d: Merge "adding logging to determine the delay between event origination and its arrival at the plugin." into eclair-mr2
Merge commit '
70a336f20c4244b6f93ba593e999e83f23af1145'
* commit '
70a336f20c4244b6f93ba593e999e83f23af1145':
adding logging to determine the delay between event origination and its arrival at the plugin.
Patrick Scott [Wed, 24 Feb 2010 03:55:54 +0000 (19:55 -0800)]
Derek Sollenberger [Wed, 24 Feb 2010 03:55:39 +0000 (19:55 -0800)]
am
5bce6668: am
15027de7: Added new logging messages and updated event logs with plugin execution time
Merge commit '
5bce666850444bb87efe0be67046e7648ff15e67'
* commit '
5bce666850444bb87efe0be67046e7648ff15e67':
Added new logging messages and updated event logs with plugin execution time
Derek Sollenberger [Wed, 24 Feb 2010 03:00:05 +0000 (19:00 -0800)]
am
da8d052d: Merge "adding logging to determine the delay between event origination and its arrival at the plugin." into eclair-mr2
Merge commit '
da8d052d7e1bf81587412213cf6680538d0bf687' into eclair-mr2-plus-aosp
* commit '
da8d052d7e1bf81587412213cf6680538d0bf687':
adding logging to determine the delay between event origination and its arrival at the plugin.
Patrick Scott [Wed, 24 Feb 2010 02:59:58 +0000 (18:59 -0800)]
Derek Sollenberger [Wed, 24 Feb 2010 02:59:52 +0000 (18:59 -0800)]
am
15027de7: Added new logging messages and updated event logs with plugin execution time
Merge commit '
15027de75d16455fd1e449b771fac8fd2cf88233' into eclair-mr2-plus-aosp
* commit '
15027de75d16455fd1e449b771fac8fd2cf88233':
Added new logging messages and updated event logs with plugin execution time
Derek Sollenberger [Tue, 23 Feb 2010 20:11:52 +0000 (12:11 -0800)]
Merge "adding logging to determine the delay between event origination and its arrival at the plugin." into eclair-mr2
Derek Sollenberger [Tue, 23 Feb 2010 19:55:21 +0000 (14:55 -0500)]
adding logging to determine the delay between event origination and its arrival at the plugin.
Steve Block [Tue, 23 Feb 2010 19:03:07 +0000 (11:03 -0800)]
Merge "Fixes a bug with showing the Geolocation permissions prompt"
Huahui Wu [Tue, 23 Feb 2010 16:24:57 +0000 (11:24 -0500)]
While upstreaming the JSC JIT patch to the open source Webkit trunk,
there were a few small changes upon the review comments.
This CL makes corresponding changes in Android code base to be
consistent with the open source Webkit trunk.
Steve Block [Fri, 12 Feb 2010 16:33:50 +0000 (16:33 +0000)]
Fixes a bug with showing the Geolocation permissions prompt
Currently, if an iframe causes the Geolocation permissions prompt to be shown,
but the frame is navigated away before the user responds to the permissions
prompt, the prompt is not removed from the screen.
This change fixes that bug. It uses the new
ChromeClient::cancelGeolocationPermissionRequestForFrame() method, which was
cherry-picked from WebKit in https://android-git.corp.google.com/g/#change,41747
The logic is complicated by the fact that multiple iframes may have requested
Geolocation permissions for the same origin. In this case, we should not hide
the prompt until the last such frame is navigated away.
Bug:
2463551
Change-Id: I1e4de05586150c7a94bc8343f6e56e4a4870cd3b
Ben Murdoch [Tue, 23 Feb 2010 15:57:35 +0000 (07:57 -0800)]
Merge "Co-ordinates of a TouchEvent object should be 0,0 to match the behavior on iPhone. It is the co-ordinates of the Touch object wrapped up by a touch event that should update with motion."
Ben Murdoch [Mon, 22 Feb 2010 15:00:01 +0000 (15:00 +0000)]
Co-ordinates of a TouchEvent object should be 0,0 to match the behavior on iPhone. It is the co-ordinates of the Touch object wrapped up by a touch event that should update with motion.
Update EventHandler::handleTouchEvent to match what landed to webkit in http://trac.webkit.org/changeset/55146
Change-Id: I91dfcfbbb53020b85f646bcf58eb4f3afd6be8e7
Steve Block [Tue, 23 Feb 2010 15:35:51 +0000 (07:35 -0800)]
Merge "Updates Android to final version of Geolocation position cache submitted to webkit.org"