summaryrefslogtreecommitdiffstats
path: root/WebCore/page
Commit message (Collapse)AuthorAgeFilesLines
* Merge "First draft to add a fat point to WebKit hit test."Grace Kloba2010-05-242-0/+16
|\
| * First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-242-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If padding is 0, it is the old style point hit test. If it finds a node, it will break the search loop and return. If padding is non-zero, the first node will be added to HitTestResult's innerNode as before. But instead of finishing the search, hit test will continue to look for other nodes covered by the fat point unless it is fully inside the current node. Here are some highlights of the changes. . instead of testing renderRect.contains(x, y), we now test renderRect.intersect(pointRect) . when a Node is hit, it will be appended to the rawNodeList of HitTestResult. So the order inside the rawNodeList represents the hit test order. Currently the fat point doesn't support SVG nodes. It also doesn't support overflow control yet.
* | Update Android to reflect upstreamed code to avoid Geolocation leaksSteve Block2010-05-242-50/+13
|/ | | | | | | | | | This is a cherry-pick of WebKit change http://trac.webkit.org/changeset/60069 This releases references to JS callbacks in the page and allows the Frame and thus the Geolocation object to be cleaned up. This change allows us to remove the Android-specific code which achieved the same through an unload listener. Bug: 2169518 Change-Id: I1ed97d40d7f69ec94a58eaa21bfa4979737cc84d
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1434-262/+296
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Cherry-pick WebKit change 58061 to add ↵Steve Block2010-05-112-0/+20
| | | | | | | | Geolocation::suspend()/resume() back in See http://trac.webkit.org/changeset/58061 Change-Id: Ie7b4b4891391656a6cc25cd30b3913f0638a0302
* Merge webkit.org at r58033 : Move Android iframe-flattening code to ↵Steve Block2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | RenderIFrame.cpp The Android iframe-flattening code was in RenderPartObject. The rendering classes have been refactored upstream in http://trac.webkit.org/changeset/57866 so that most of RenderPartObject was moved to RenderIFrame. RenderPartObject was then removed in http://trac.webkit.org/changeset/57900. Iframe-flattening was also added upstream in http://trac.webkit.org/changeset/56718. This change takes the Android iframe-flattening code from RenderPartObject and moves it to RenderIFrame. It also renames FLATTEN_IFRAME to ANDROID_FLATTEN_IFRAME and FLATTEN_FRAMESET to ANDROID_FLATTEN_FRAMESET for clarity. Change-Id: I1af8d042f8d0c4abd513f8a315ac681360c1cc53
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-1110-185/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1168-537/+2783
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* am bf13d116: am ec366141: am 7f034a17: Fix a ref counting bug in touch event ↵Ben Murdoch2010-05-061-5/+5
|\ | | | | | | handling. The RefPtr returned from m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ende
| * Fix a ref counting bug in touch event handling. The RefPtr returned from ↵Ben Murdoch2010-05-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | m_originatingTouchPointTargets.take() was only in scope for the duration of the else block but we saved the raw pointer it wrapped. When the else block ended, the RefPtr destroyed itself, also deleting it's enclosed pointer if it held the final ref. But we had a saved copy of this raw pointer and then went on to use it later. Fix bug 2543728. Change-Id: I90e17693e15bff0969f103b5947d004837189c44
* | am 4190ab28: am cc7f2722: am da713c02: Fix a crash caused by navigating away ↵Ben Murdoch2010-05-051-0/+3
|\ \ | |/ | | | | from a page with your finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage c
| * Fix a crash caused by navigating away from a page with your finger still ↵Ben Murdoch2010-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection. Cherry pick of webkit.org revision 58760. Bug=2543728 Change-Id: I4c9a896ff81881211746451f49158b7e99eb9166
* | Merge changes ↵Steve Block2010-04-2921-83/+203
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ie9ba4c69,I35363367,I18aaae5f,I2c315360,I4f163c97,Ib640e64c,I98a4af82 * changes: Merge webkit.org at r55033 : Update WebKit revision Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android Merge webkit.org at r55033 : Fix merge conflicts Merge webkit.org at r55033 : Initial merge by git
| * | Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2721-83/+203
| |/ | | | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* | Cherry pick of WebKit.org revision r58323. Improves documentation for the ↵Ben Murdoch2010-04-281-0/+7
|/ | | | | | TouchStationary handler after discussions in webkit bug 37609. Change-Id: I347b2c8050505fd8747f46d90596882258451d3f
* Add on-demand plugin support.Patrick Scott2010-03-232-0/+11
| | | | | | | | | | | | | | | | The Settings object now has an on-demand flag for plugins (this was to avoid more edits to webkit code). If plugins are on-demand and a plugin is installed that can handle the content, insert a placeholder widget. If the user clicks on the placeholder, the plugin will be enabled. The widget currently does not clip the context correctly. It only clips based on the widget frame. This is due to a bug (already filed) where the scroll offset is producing bad clip rectangles. Requires a framework change. Bug: 2411524 Change-Id: If3931da8da2339a2385ae78b609c49fa069892ab
* Fixes the Mac buildSteve Block2010-03-171-0/+2
| | | | | | | | - JavaInstanceJSC.cpp - Adds ANDROID guards around some temporary logging - Geolocation.cpp - Adds ANDROID guards around changes waiting to be upstreamed - WebChromeClient.h / EmptyClients.h - Pulls the Mac part of a WebKit change for which only the Android part was cherry-picked in https://android-git.corp.google.com/g/#change,41747 Change-Id: Ide97cb6b05e78528fe4b9430466837dedaadc4cf
* Pass mouse events to the subframe as the other portsGrace Kloba2010-03-161-14/+7
| | | | | | | | | | by calling subframe handler. Most of the time, nav cache found the iframe and calls the correct eventhandler. But when nav cache fails, we use the top frame and we need to pass the mouse events to the subframe. http://b/issue?id=2521087
* Merge "Prepare touch key modifiers for upstreaming."Ben Murdoch2010-03-111-5/+2
|\
| * Prepare touch key modifiers for upstreaming.Ben Murdoch2010-03-111-5/+2
| | | | | | | | | | | | | | | | | | Fix two compiler warnings in EventHandler.cpp The webkit bug tracking this was https://bugs.webkit.org/show_bug.cgi?id=35521 and was landed to the WebKit tree as r55843. Change-Id: Id49ba00d49bf98797a79b6f55b1cb1f906f5e0ad
* | Marks remaining Android-specific changes to Geolocation with ANDROIDSteve Block2010-03-112-0/+18
| | | | | | | | Change-Id: I23e2ef2ec23b340e0bfe8bbf0e71e2c675fda676
* | Update Android to reflect final version submitted to webkit.org for ↵Steve Block2010-03-112-31/+28
| | | | | | | | | | | | | | | | Geolocation maximumAge See http://trac.webkit.org/changeset/55841 Change-Id: Ib504563b7be40b0ff794cdcc625b07f494bb6483
* | Merge "When starting the Geolocation service, we need to make sure that we ↵Steve Block2010-03-101-1/+6
|\ \ | |/ |/| | | have a valid FrameView before querying the Java side to determine whether the WebView is paused."
| * When starting the Geolocation service, we need to make sure that we have a ↵Steve Block2010-03-091-1/+6
| | | | | | | | | | | | | | valid FrameView before querying the Java side to determine whether the WebView is paused. Bug: 2501254 Change-Id: Ideb86ce4c35efb7bc7595c4205dc1e8d5c1cf106
* | Only call plugin touch code if it is in full screenLeon Scroggins2010-03-092-56/+0
|/ | | | | | | | | | | | | mode or it is the document focused node. Remove Android special code added to support prevent default for double tap and long press. Long press and double tap needs to call preventDefault if it is needed. Remove Android special code added to pass event time. Need a separate CL for android_npapi.
* 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-012-10/+12
| | | | | | | | 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
* Adds a missing initializer for Geolocation maximumAgeSteve Block2010-02-241-0/+1
| | | | Change-Id: I7274d12baa4718280e8cc677583e5308c7917a56
* 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
* 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
* | Cherry-pick WebKit change 55136 to add a means to cancel an ongoing ↵Steve Block2010-02-234-3/+14
|/ | | | | | | | | | | | | | 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
* Fixes a bug with the Geolocation suspend/resume behaviourSteve Block2010-02-181-0/+8
| | | | | | | | | | | | | PlatformBridge::isWebViewPaused needs to be an instance method, rather than a static. This fixes a bug where if the user switches browser windows while a page that uses Geolocation is still loading, the Geolocation service won't be started in the suspended state. Note that this is a temporary fix, as the upstreaming of the existing suspend/resume code will introduce a new approach, which will avoid this problem altogether. See https://android-git.corp.google.com/g/#change,38942 Change-Id: I3f07f8837b8a8c1c5e7e4f5112ab487188670c3a
* Merge webkit.org at r54731 : Fix merge conflicts due to frame flatteningSteve Block2010-02-162-11/+7
| | | | | | | | | Common frame flattening code was added upstream in http://trac.webkit.org/changeset/54440 We take this code, but also keep the current Android-specific implementation. Currently, the common code is disabled and we continue to use the Android version. The two will be combined at a later date. Change-Id: I194c7028b84a05d85040ca6199802c42a520be96
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1614-41/+116
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Don't add something to a hash map and then get it out again immediately if ↵Ben Murdoch2010-02-151-2/+5
| | | | | | we don't need to. Change-Id: Ic6718a7c23e8896f5bbbb5cadcc22aa9a3108530
* Fix the creation of the touchTargets list to match what the iPhone does and ↵Ben Murdoch2010-02-151-18/+47
| | | | | | | | | | maintain compatability with existing apps like SuperPudu. touchTargets should always have at least one element and should be based on the target where the touch originated, not where it is now. This needs to be upstreamed to webkit. Change-Id: Ie4e6f65e77484e0eac6d0f239df9dd3a460e7bce
* Store the originating target for a touch (i.e. calculated in touchstart) in ↵Ben Murdoch2010-02-152-7/+22
| | | | | | | | a hash map, so that we can use that originating target as the target for future move/end/cancel events that that touch generates. This matches the behaviour that the iPhone exhibits. Change-Id: Iff5e29c795b8ae6128e67ad5d42a959b61f966f2
* Merge webkit.org at r54340 : Cherry-pick WebKit change 54417 to fix ↵Steve Block2010-02-153-9/+5
| | | | | | | | ENABLE_DEBUGGER guards for V8 See http://trac.webkit.org/changeset/54417 Change-Id: I03e7f8f1ddb9af92e5ce7494136ea2d2a6de6800
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1514-168/+274
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-123-5/+46
| | | | | | This CL contains the wiring between the API and the Java side. Fix b: 2371005
* Fix the V8 build by adding files missing from ↵Andrei Popescu2010-02-091-0/+45
| | | | ece0a38a9778edd2ae7a550df7dcd38d1e11e7d0
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-093-6/+27
| | | | | | This CL contains the V8 DOM bindings and IDL changes. Fix b:2371005
* Merge webkit.org at r54127 : Fix conflicts with Android addition of touch ↵Steve Block2010-02-041-10/+1
| | | | | | | | | event time This is not yet upstreamed, so we keep ours. See https://android-git.corp.google.com/g/#change,39424 Change-Id: I65233af30227b7dd84a1c2b29e5dfc6da20e905e
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-042-10/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap ↵Steve Block2010-02-041-36/+2
| | | | | | | touchevents Keep ours as this code has not yet been upstreamed. Change-Id: Ia05ab6c8c36b2d332fec2fe4c16ceacff2933382
* Merge webkit.org at r54127 : Resolve conflicts for handleTouchEventSteve Block2010-02-042-12/+1
| | | | | | On Android, handleTouchEvent returns int, rather than bool. Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5
* Merge webkit.org at r54127 : Resolve Geolocation conflicts.Steve Block2010-02-046-88/+0
| | | | | | | Keep ours for maximumAge code. Take theirs for client-based Geolocation code. Change-Id: I72baa0026b1cd1bec617843a992dfb6008ca774d