summaryrefslogtreecommitdiffstats
path: root/WebKit/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixes a leaked JNI local reference in ↵Steve Block2010-03-051-0/+1
|\ | | | | | | MIMETypeRegistry::getMIMETypeForExtension"
| * Fixes a leaked JNI local reference in MIMETypeRegistry::getMIMETypeForExtensionSteve Block2010-03-051-0/+1
| | | | | | | | | | | | | | | | | | 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
* | Merge "Remove unnecessary call to ↵Andrei Popescu2010-03-052-7/+1
|\ \ | | | | | | | | | ChromeClientAndroid::scheduleCompositingLayerSync()."
| * | Remove unnecessary call to ChromeClientAndroid::scheduleCompositingLayerSync().Andrei Popescu2010-03-052-7/+1
| | | | | | | | | | | | Fix b: 2471383
* | | Merge "Fix history restore."Patrick Scott2010-03-051-9/+2
|\ \ \
| * | | Fix history restore.Patrick Scott2010-03-051-9/+2
| |/ / | | | | | | | | | | | | 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.
* | | Merge "fixes with find drawing in layers"Cary Clark2010-03-051-0/+5
|\ \ \ | |/ / |/| |
| * | fixes with find drawing in layersCary Clark2010-03-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "disable visiblerect debugging printfs"Mike Reed2010-03-041-1/+1
|\ \ \ | |/ / |/| |
| * | disable visiblerect debugging printfsMike Reed2010-03-041-1/+1
| |/
* | Don't leak global weak references when running layout testsLeon Clarke2010-03-041-1/+1
|/
* Merge "stop parsing text for addresses if input element is found"Cary Clark2010-03-031-1/+3
|\
| * stop parsing text for addresses if input element is foundCary Clark2010-03-031-1/+3
| | | | | | | | http://b/2420076
* | Merge "Call setCurrentIndex to trigger the client callback."Patrick Scott2010-03-031-6/+5
|\ \
| * | Call setCurrentIndex to trigger the client callback.Patrick Scott2010-03-031-6/+5
| | |
* | | Merge "Fix V8 build when instrumentation is on"Andrei Popescu2010-03-032-1/+2
|\ \ \ | |/ / |/| |
| * | Fix V8 build when instrumentation is onAndrei Popescu2010-03-032-1/+2
| | |
* | | Merge "Fixes a crash in WeakJavaInstance"Steve Block2010-03-031-8/+16
|\ \ \ | |_|/ |/| |
| * | 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
* | refactor find state and scrollingCary Clark2010-03-032-18/+29
| | | | | | | | | | | | | | | | | | | | 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
* | allow anchor containing layer to be mapped to navable layerCary Clark2010-03-023-13/+61
|/ | | | | | | | | | | | | | | | 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
* 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
* | 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
* ignore rootlayer when drawing (fixes regression)Mike Reed2010-02-261-1/+6
| | | | dump layers contents in displayTree.txt
* 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
* | | Merge "refactor drawing to support layers"Cary Clark2010-02-2516-386/+464
|\ \ \
| * | | refactor drawing to support layersCary Clark2010-02-2416-386/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-245-29/+21
| | | | | | | | | | | | | | | | | | | | | * Rename setRootLayer to setUIRootLayer * Fixed some logs in GraphicsLayerAndroid * Added back the diagonal drawing debug code in LayerAndroid * Simplified ChromeClientAndroid, removed compositingLayerSync()
* | | 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
* | 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.
| * \ 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.
| * | | 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
| * | Added new logging messages and updated event logs with plugin execution timeDerek Sollenberger2010-02-233-16/+36
| | |
* | | Fixes a bug with showing the Geolocation permissions promptSteve Block2010-02-234-34/+93
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-231-0/+1
|\ \ | | | | | | | | | Geolocation permission request"
| * | Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geolocation permission request This is part of the change required to fix a Geolocation permissions bug. See https://android-git.corp.google.com/g/#change,40601 Note that We take only the WebCore component of the change, but additional changes are required to ChromeClientAndroid. See http://trac.webkit.org/changeset/55136 Change-Id: Iff0eab3adc3e41876df7f114c0d50243d015664f
* | | Merge "Implement redirectDataToPlugin."Patrick Scott2010-02-222-9/+41
|\ \ \
| * | | Implement redirectDataToPlugin.Patrick Scott2010-02-222-9/+41
| |/ / | | | | | | | | | | | | | | | This fixes going to swf files directly (i.e. http://foo.com/bar.swf). Bug: 2435632
* | | am 4c76da0e: am 1044e7fd: Fixes error where plugin is created while ↵Derek Sollenberger2010-02-222-17/+13
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | iterating through the list of plugins. Merge commit '4c76da0e5177ea82be36bb81e67b52d51a5a72bb' * commit '4c76da0e5177ea82be36bb81e67b52d51a5a72bb': Fixes error where plugin is created while iterating through the list of plugins.
| * Fixes error where plugin is created while iterating through the list of plugins.Derek Sollenberger2010-02-222-17/+13
| | | | | | | | bug #2438492
generated by cgit v1.1 at 2025-11-29 22:18:59 +0000