summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-113-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-1147-522/+904
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Adds a couple of missing headers to CachedLinkPrefetch.hSteve Block2010-05-071-1/+2
| | | | | | These will be required with the upcoming WebKit merge. Change-Id: I610d6bf5ea919c6842808fd6090f68dc010f4b2e
* Merge "Enable SVG compiling in gingerbread."Shimeng (Simon) Wang2010-05-041-3/+6
|\
| * Enable SVG compiling in gingerbread.Shimeng (Simon) Wang2010-05-041-3/+6
| | | | | | | | | | | | | | | | Compiled successfully for both V8 and JSC. The libwebcore size changes from 5354080 to 6072344, the diff is 700KB. Change-Id: Id95abd8b8f2181ed7789a95e0675cb8436e11bf7
* | Link prefetch supportLeon Clarke2010-05-048-16/+143
|/ | | | http://b/issue?id=2268353
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-276-7/+18
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Revert the ANDROID_FIX which is the same as the original.Shimeng (Simon) Wang2010-04-221-5/+1
| | | | | | | | Since the ! operator is overloaded to check whether the string is NULL. I tested it out, the ! works when the http-referrer is not defined. So the ANDROID_FIX is redundant. Change-Id: If6b54e195a954ec7f2705da89c13563a8698467d
* Cherry-pick http://codereview.chromium.org/1594015Andrei Popescu2010-04-121-0/+1
| | | | | | Fix bug: 2588909 Change-Id: I4102e4aebb9edb8219e6b9f3bb57f0cb969f1d15
* Make sure WebKit's page cache does not cache pages with unload handlers.Andrei Popescu2010-03-291-6/+0
| | | | | | Fix b: 2552004 Change-Id: Iac6737fbb9a1eca734ea7474f99ccf66ee916bd7
* Revert "Revive my change to not add anchor navigations to the history in ↵Patrick Scott2010-03-231-7/+0
| | | | | | some cases." This reverts commit a6e5d463b2fbb6ad4e154719d6846231a32764a7.
* Add a new API on the resource loader to pause the current load. We use this ↵Ben Murdoch2010-03-222-0/+13
| | | | | | | | | | | when the plugin cannot accept any more data to prevent WebKit buffering the data that the plugin can't take. This can result in a crash if the buffer gets too big (when watching an HD movie clip in flash, for example). Requires a frameworks/base change. Change-Id: Ibb63d38df1014ff70fa4d65275613cbf3a217c1a
* Fixes the Mac buildSteve Block2010-03-171-0/+1
| | | | | | | | - 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
* Fix a webkit bug.Shimeng (Simon) Wang2010-03-171-0/+4
| | | | Change-Id: Ib8ae67e76c03027fcece73f2d36fc0ea41164e40
* Use the complete url when blocking images.Patrick Scott2010-03-041-1/+1
| | | | | | | Image urls that are relative to a base url need to be resolved before looking at the scheme. Bug: 2455482
* Revive my change to not add anchor navigations to the history in some cases.Patrick Scott2010-03-031-0/+7
| | | | | | | | | Do not add history items when there is an anchor navigation if the user did not initiate the event. We backed out this change because cnn.com fixed itself but now app.showtime-app.com does the same trick and prevents the Browser from being able to go back.
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-165-21/+63
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-155-60/+36
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ↵Steve Block2010-02-041-3/+0
| | | | | | | | ARCHIVE See http://trac.webkit.org/changeset/52314 Change-Id: Ic6d1b8164ebe646450d5866882e1b692e3076060
* Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ↵Steve Block2010-02-041-4/+0
| | | | | | | | ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/52177 Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42
* Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROIDSteve Block2010-02-041-5/+1
| | | | | | See http://trac.webkit.org/changeset/52791 Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0452-209/+323
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-271-0/+4
| | | | | | | | | | | detached rather than when eventHandlers are cleared for a frame. Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers that have been registered. Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052
* Reverts Android-specific change to avoid adding history items for fragment ↵Steve Block2010-01-072-27/+0
| | | | | | | | scrolls initiated by script. Bug: 2360542 Change-Id: I4a60840dfb89753b4f56f96b5017269bfcf99392
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-173-43/+24
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1731-236/+420
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Pull down change 51321 from webkit.org.Patrick Scott2009-12-091-2/+2
| | | | | Calls to EventNames() was causing multiple copies of the event names to be created. This could cause false negatives in hash map lookups.
* Experimental change. Cache pages with unload eventGrace Kloba2009-12-031-0/+6
| | | | | for back/forward. This will improve the history navigation. But it may break some sites. See discussion in https://bugs.webkit.org/show_bug.cgi?id=29021.
* Android History unforking pt2: BackForwardList changes. Fire a notification ↵Ben Murdoch2009-12-032-14/+6
| | | | | | | | to the FrameLoaderClient that the BackForwardList has been modified. This needs to be upstreamed to webkit.org. Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
* add ANDROID to the list of platforms that support font-faceMike Reed2009-11-301-1/+1
|
* Change window focus only if the user initiated the event.Patrick Scott2009-11-192-0/+12
| | | | | | | | | | | | | This does not work in the javascript case because the user gesture is stored in the caller's script environment and that knowledge is not obtainable in the receiving frame. However, this change allows targeted links to change the focus to the correct window but prevents sites like slate.com from changing back to the opening window. This change will be followed by a simple revert of the previous change in the Browser app. Bug: 2161671
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-102-130/+10
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1019-1332/+1736
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-271-11/+2
| | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-225-4/+2
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : Update KURL constructor call sites to new ↵Steve Block2009-10-201-1/+1
| | | | | | | | signature. See http://trac.webkit.org/changeset/47907 Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-204-14/+2
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2062-1454/+2005
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-142-2/+2
| | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
* Fix bug 2132969Patrick Scott2009-10-081-0/+7
| | | | | | | | | Check for a user gesture before adding the history item during a fragment scroll. The bug has been reported to webkit.org with the suggested fix. Although upstream webkit does not have the user gesture additions defined by ANDROID_USER_GESTURE. Bug: 2132969
* Fix the user gesture change to be more like donut.Patrick Scott2009-09-301-1/+4
| | | | Bug: 2151004
* Add ANDROID_USER_GESTURE back to WebCore.Patrick Scott2009-09-242-0/+40
| | | | | | | We only care about the user gesture during a location change. Add the m_userGesture field to our ResourceRequest and check the value in canHandleRequest. This could be cleaner if WebCore passed around the ResourceRequest rather than constructing a new one.
* Add apple-touch-icon-precomposed processing.Patrick Scott2009-09-221-1/+1
| | | | Send up a boolean to indicate if the touch icon url is precomposed.
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1920-314/+142
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1820-142/+314
|
* Continue with linker error fixes.Ben Murdoch2009-08-171-1/+10
|
* Fixes for Clipboard and IconDatabaseBen Murdoch2009-08-141-8/+0
|
* Add todo to remember to check with Grace if this merge was correctAndrei Popescu2009-08-131-0/+1
|
* Fix left over maunal mergesAndrei Popescu2009-08-132-34/+6
|
generated by cgit v1.1 at 2025-05-31 04:43:45 +0000