summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes a crash in WeakJavaInstanceSteve Block2010-03-031-8/+16
| | | | | | | | | | | | | | | | | | | | | | | 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
* Merge "use advance widths to deduce spaces in selected text"Cary Clark2010-03-011-15/+41
|\
| * use advance widths to deduce spaces in selected textCary Clark2010-03-011-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Adds Android-specific result for a Geolocation LayoutTest that fails ↵Steve Block2010-03-011-0/+13
|\ \ | | | | | | | | | with V8"
| * | Adds Android-specific result for a Geolocation LayoutTest that fails with V8Steve Block2010-02-251-0/+13
| | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Make nativeMoveCursorToNextTextInput return a value based on success."Leon Scroggins2010-03-013-14/+11
|\ \ \
| * | | Make nativeMoveCursorToNextTextInput return a value based on success.Leon Scroggins2010-03-013-14/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | The element that receives the touch event should be the target element of ↵Ben Murdoch2010-03-012-90/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Update touch handler in preparation for upstreaming of ↵Ben Murdoch2010-03-014-13/+16
|/ / | | | | | | | | | | | | | | 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
* | Merge "ignore rootlayer when drawing (fixes regression) dump layers contents ↵Mike Reed2010-02-262-4/+11
|\ \ | | | | | | | | | in displayTree.txt"
| * | ignore rootlayer when drawing (fixes regression)Mike Reed2010-02-262-4/+11
| | | | | | | | | | | | dump layers contents in displayTree.txt
* | | Merge " Don't crash when throwing javascript exceptions from plugins ↵Leon Clarke2010-02-261-1/+5
|\ \ \ | |/ / |/| | | | | without javascript having been initialised."
| * | Don't crash when throwing javascript exceptions from plugins withoutLeon Clarke2010-02-261-1/+5
| | | | | | | | | | | | javascript having been initialised.
* | | Merge "Adds layout tests for HTML5 features"Steve Block2010-02-26367-0/+16828
|\ \ \ | | |/ | |/|
| * | Adds layout tests for HTML5 featuresSteve Block2010-02-25367-0/+16828
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "enable debugger support in webkit with v8"Andrei Popescu2010-02-261-6/+0
|\ \ \
| * | | enable debugger support in webkit with v8Andrei Popescu2010-02-261-6/+0
| | | |
* | | | Merge "make methods private (or static local) if possible to reduce surface ↵Mike Reed2010-02-262-7/+6
|\ \ \ \ | | | | | | | | | | | | | | | area of API"
| * | | | make methods private (or static local) if possible to reduce surface area of APIMike Reed2010-02-252-7/+6
| | | | |
* | | | | Merge "Only set the DatabaseTracker path if it has been successfully set to ↵Ben Murdoch2010-02-261-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | something on the Java side as the DatabaseTracker only allows us to set it once."
| * | | | | Only set the DatabaseTracker path if it has been successfully set to ↵Ben Murdoch2010-02-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | something on the Java side as the DatabaseTracker only allows us to set it once. Change-Id: I5d0121dac9a2b276a483992784822c1f52c04853
* | | | | | Merge "Prevent unsafe upper casting by checking Element's namespaceURI."Shimeng (Simon) Wang2010-02-251-4/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Prevent unsafe upper casting by checking Element's namespaceURI.Shimeng (Simon) Wang2010-02-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | remove unused methodsMike Reed2010-02-253-53/+4
| |_|/ / / |/| | | |
* | | | | Fix the gap when using the IME (Bug:2453748)Nicolas Roard2010-02-253-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | Merge "Temporarily disable debugger support on V8 due to a crash"Andrei Popescu2010-02-251-0/+6
|\ \ \ \ \
| * | | | | Temporarily disable debugger support on V8 due to a crashAndrei Popescu2010-02-251-0/+6
| | | | | |
* | | | | | Merge "refactor drawing to support layers"Cary Clark2010-02-2521-415/+646
|\ \ \ \ \ \
| * | | | | | refactor drawing to support layersCary Clark2010-02-2421-415/+646
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge " Don't display our custom border round combo boxes when the ↵Leon Clarke2010-02-251-2/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | stylesheet has defined one."
| * | | | | Don't display our custom border round combo boxes when the stylesheet ↵Leon Clarke2010-02-241-2/+20
| | |_|_|/ | |/| | | | | | | | | | | | | has defined one.
* | | | | Merge "Use reference instead of vector copying when dealing formElements."Shimeng (Simon) Wang2010-02-241-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Use reference instead of vector copying when dealing formElements.Shimeng (Simon) Wang2010-02-241-3/+3
| | | |
* | | | Simplify the layer code:Nicolas Roard2010-02-248-39/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename setRootLayer to setUIRootLayer * Fixed some logs in GraphicsLayerAndroid * Added back the diagonal drawing debug code in LayerAndroid * Simplified ChromeClientAndroid, removed compositingLayerSync()
* | | | Merge "Adds a missing initializer for Geolocation maximumAge"Steve Block2010-02-241-0/+1
|\ \ \ \
| * | | | Adds a missing initializer for Geolocation maximumAgeSteve Block2010-02-241-0/+1
| | |/ / | |/| | | | | | | | | | Change-Id: I7274d12baa4718280e8cc677583e5308c7917a56
* | | | Do not forward touch event types we do not support into WebCore as ↵Ben Murdoch2010-02-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Re-enable the layersNicolas Roard2010-02-241-1/+1
|/ / /
* | | Merge "Removes repeated headers in Geolocation.cpp"Steve Block2010-02-241-8/+0
|\ \ \
| * | | Removes repeated headers in Geolocation.cppSteve Block2010-02-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These were erroneously added in a previous WebKit merge. See https://android-git.corp.google.com/g/#change,39242 Change-Id: I192911ec35d7447ae3933cf4903aacd2ab202a3a
* | | | am 70a336f2: am da8d052d: Merge "adding logging to determine the delay ↵Derek Sollenberger2010-02-231-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * \ \ \ am da8d052d: Merge "adding logging to determine the delay between event ↵Derek Sollenberger2010-02-231-3/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * \ \ \ Merge "adding logging to determine the delay between event origination and ↵Derek Sollenberger2010-02-231-3/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | its arrival at the plugin." into eclair-mr2
| | | * | | | adding logging to determine the delay between event origination and its ↵Derek Sollenberger2010-02-231-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | arrival at the plugin.
* | | | | | | am f494d11a: (-s ours) am 48633eb7: Do not merge.Patrick Scott2010-02-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f494d11a4894673d0dae0ce65ae911209f9821e2' * commit 'f494d11a4894673d0dae0ce65ae911209f9821e2': Do not merge.
| * | | | | | am 48633eb7: Do not merge.Patrick Scott2010-02-232-9/+41
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '48633eb761269223d399736219ca400d62df8027' into eclair-mr2-plus-aosp * commit '48633eb761269223d399736219ca400d62df8027': Do not merge.
| | * | | | | Do not merge.Patrick Scott2010-02-232-9/+41
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement redirectDataToPlugin. This fixes going to swf files directly (i.e. http://foo.com/bar.swf). Bug: 2435632
* | | | | | am 5bce6668: am 15027de7: Added new logging messages and updated event logs ↵Derek Sollenberger2010-02-233-16/+36
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | with plugin execution time Merge commit '5bce666850444bb87efe0be67046e7648ff15e67' * commit '5bce666850444bb87efe0be67046e7648ff15e67': Added new logging messages and updated event logs with plugin execution time
| * | | | am 15027de7: Added new logging messages and updated event logs with plugin ↵Derek Sollenberger2010-02-233-16/+36
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | execution time Merge commit '15027de75d16455fd1e449b771fac8fd2cf88233' into eclair-mr2-plus-aosp * commit '15027de75d16455fd1e449b771fac8fd2cf88233': Added new logging messages and updated event logs with plugin execution time
| | * | | Added new logging messages and updated event logs with plugin execution timeDerek Sollenberger2010-02-233-16/+36
| | | | |
generated by cgit v1.1 at 2025-11-29 15:04:24 +0000