summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make methods private (or static local) if possible to reduce surface area of APIMike Reed2010-02-252-7/+6
|
* 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
| | | | |
* | | | | Merge "Fixes a bug with showing the Geolocation permissions prompt"Steve Block2010-02-234-34/+93
|\ \ \ \ \
| * | | | | 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
* | | | | | While upstreaming the JSC JIT patch to the open source Webkit trunk,Huahui Wu2010-02-232-3/+4
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge "Co-ordinates of a TouchEvent object should be 0,0 to match the ↵Ben Murdoch2010-02-232-22/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | behavior on iPhone. It is the co-ordinates of the Touch object wrapped up by a touch event that should update with motion."
| * | | | Co-ordinates of a TouchEvent object should be 0,0 to match the behavior on ↵Ben Murdoch2010-02-232-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Updates Android to final version of Geolocation position cache ↵Steve Block2010-02-232-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | submitted to webkit.org"
| * | | | | Updates Android to final version of Geolocation position cache submitted to ↵Steve Block2010-02-232-11/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit.org See http://trac.webkit.org/changeset/55142 Change-Id: I8fabc89b596b0e61e8ae389e07af2e898de3bad1
* | | | | Merge "Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-235-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Geolocation permission request"
| * | | | | Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-235-3/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | add optional build flag to trigger enabling layersMike Reed2010-02-231-0/+4
| | | | |
* | | | | 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.
| * | | am 1044e7fd: Fixes error where plugin is created while iterating through the ↵Derek Sollenberger2010-02-222-17/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | list of plugins. Merge commit '1044e7fd4ebb61e6133d4f4dda69810e3af9da14' into eclair-mr2-plus-aosp * commit '1044e7fd4ebb61e6133d4f4dda69810e3af9da14': 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
* | | | Merge "Update Android to reflect upstreaming of matrix optimization in ↵Steve Block2010-02-222-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | RenderLayer.cpp"
| * | | | Update Android to reflect upstreaming of matrix optimization in RenderLayer.cppSteve Block2010-02-222-9/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/55081 Change-Id: If34e70743c554b2a5e8315b2657cce6964805f6a
* | | | Fix for busy loopNicolas Roard2010-02-221-1/+0
|/ / / | | | | | | | | | Bug:2457438
* | | disable webkit layersCary Clark2010-02-212-1/+3
| | | | | | | | | | | | | | | With layers enabled, servicing timers saturate the CPU at times. This also fixes a compile-time switch in FindCanvas to disable layers.
* | | move viewport into just this subclassMike Reed2010-02-195-173/+148
| | |
* | | fix nav layer bugsCary Clark2010-02-193-9/+20
| | | | | | | | | | | | | | | | | | | | | Clip the nodes inside the layer to the layer's bounds Don't crash if the layer with the matching id can't be found. http://b/2453945
* | | Update Android to reflect recent upstreaming of V8 runtime feature default ↵Steve Block2010-02-192-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | values See http://trac.webkit.org/changeset/55020 Change-Id: I4d6c067dcafc43d2798c55e042e446d4964b326f