summaryrefslogtreecommitdiffstats
path: root/WebCore/page
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug 2816268: Refactor ANDROID_USER_GESTURE codeKristian Monsen2010-07-154-19/+0
| | | | | | | | | | | | | | | | | | | Used the UserGestureIndicator class instead of the local ANDROID_USER_GESTURE code. I have made a simple test case for the problem at: http://updates.monsen.it/source.html This cannot be made into a layout test since the Android Dumprendertree does not support focus on windows other than the main one. Lots of local changes removed, but not many actual changes. Most are in parameters sent to other functions. As far as I can see they user gestures are only checked for in ChromeClientAndroid.cpp and WebCoreFrameBridge.cpp, and I replaced ANDROID_USER_GESTURE with UserGestureIndicator::processingUserGesture(). The UserGestureIndicator class was added to webkit in this CL: http://trac.webkit.org/changeset/57045 ResourceRequest.h is a cherry-pick of this CL from webkit.org http://trac.webkit.org/changeset/62668 Change-Id: Ia254b2cee833459fcc2cacfb2751ef7a29a8f64a
* am b34d9d68: merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ | | | | | | | | | | | | Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010' * commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010': Fix missing NL
| * Fix missing NLBruce Beare2010-06-251-1/+1
| | | | | | | | | | Change-Id: I6757ab42e52b9d878f06da4bdc757c4626e3d0c5 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | Merge WebKit at r62496: Fix conflictsSteve Block2010-07-093-15/+3
| | | | | | | | | | | | | | | | | | | | HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
* | Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0925-17/+722
| | | | | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* | Fix issue 2823805: let expanded iframe scroll.Shimeng (Simon) Wang2010-07-081-0/+2
| | | | | | | | | | issue: 2823805 Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
* | Merge WebKit at r61871: Compile fix for PrintContext.cppKristian Monsen2010-07-021-0/+1
| | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/61232. Not sure why it compiles on other platforms. Change-Id: I6f109ebdb6069b00cefbb528a9d38cc3df0079f7
* | Merge WebKit at r61871: Fix conflicts in Frame.cppKristian Monsen2010-07-022-41/+4
| | | | | | | | | | | | | | Code was moved from Frame.cpp, this created problems for local changes. Should be working again now (with more local changes). http://trac.webkit.org/changeset/61217/trunk/WebCore/page/Frame.cpp Change-Id: Ica56218eb972a1d0d311900efc1a2b3c609dae75
* | Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0227-205/+507
| | | | | | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* | Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-301-0/+4
| | | | | | | | | | | | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* | Merge webkit.org at r61121: Fix conflicts.Ben Murdoch2010-06-182-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflicts due to addition of m_pageinateDuringLayoutEnabled in Settings.cpp|h See http://trac.webkit.org/changeset/60509 Fix conflicts in ImageSource.h due to new functions being added in the same spot as an un upstreamed Android addition. See http://trac.webkit.org/changeset/60927 Fix conflicts due to addition of !PLATFORM(CAIRO) to guard Android has changed and not upstreamed. See http://trac.webkit.org/changeset/60760 Fix conflicts due to a variable renaming colliding with an Android ifdef which is not upstream. See http://trac.webkit.org/changeset/61106 Fix conflicts due to Android IDB makefile fix collising with addition of new IDB file. See http://trac.webkit.org/changeset/61120 Fix conflicts due to un-upstreamed makefile edits colliding with an upstream change. See http://trac.webkit.org/changeset/61000 Change-Id: I330e08850b96d7c9fb1d093663c5847b9140683d
* | Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1628-59/+229
| | | | | | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* | Cherry-pick WebKit change r60069 to fix a leak in GeolocationSteve Block2010-06-092-0/+21
| | | | | | | | | | | | | | | | | | | | This change was made as a fix for Bug https://bugs.webkit.org/show_bug.cgi?id=39288 but was later rolled back in r60441 pending further discussion. We need this fix, so cherry-pick it to Android until https://bugs.webkit.org/show_bug.cgi?id=39288 is fixed properly. Change-Id: Ie5cc610b841798e42ec1232b4af7674ce425b2c4
* | Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-081-24/+8
| | | | | | | | | | | | | | The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView http://trac.webkit.org/changeset/60104 Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
* | Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0822-331/+480
| | | | | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* | Report correct window.innerWidth and window.innerHeight.Grace Kloba2010-05-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | I agree with this article that we should have a way to report the visible viewport to the JavaScript. http://www.quirksmode.org/mobile/viewports2.html#link6 Fix http://b/issue?id=2717861 I will try to upstream the code to WebKit separately.
* | Merge WebKit at r60074: Fix conflictsSteve Block2010-05-273-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceOrientation - WebCore/Android.derived.jscbindings.mk - WebCore/Android.derived.v8bindings.mk - WebCore/page/Page.cpp Trivial - WebCore/css/CSSParser.cpp - WebCore/page/Settings.cpp - WebCore/page/Settings.h - WebCore/rendering/style/RenderStyle.h Code deletion - See http://trac.webkit.org/changeset/59749 - WebCore/html/HTMLTokenizer.cpp PluginView JSC guards uspstreaming - WebCore/plugins/PluginView.cpp - WebCore/plugins/PluginView.h Refactoring, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderLayer.cpp RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderBlock.h Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6
* | Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-2714-12/+129
| | | | | | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* | Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-251-15/+4
| | | | | | | | Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
* | Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2516-261/+300
| | | | | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* | 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."
generated by cgit v1.1 at 2025-10-16 00:59:12 +0000