summaryrefslogtreecommitdiffstats
path: root/WebCore/html
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1690-2503/+3845
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : friend needed after @60361 made many things privateLeon Clarke2010-06-081-0/+12
| | | | | | | | http://trac.webkit.org/changeset/60361 These changes are layering violations so should be removed before upstreaming. Change-Id: I9ae45d9d0d8f4fa3a5cd1501f10b716be3a7dd85
* Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-082-12/+1
| | | | | | | 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-08154-1514/+3228
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Enable File Reader and blob.slice APIs.Ben Murdoch2010-06-021-1/+1
| | | | | | | | | Notes: - the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325 - the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374 - this needs a corresponding frameworks/base change Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820
* Merge WebKit at r60074: Fix conflictsSteve Block2010-05-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27121-650/+2692
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Remove the unnecessary return keyword.Shimeng (Simon) Wang2010-05-261-2/+2
| | | | Change-Id: If55ba03f4c46afed544083263fbd6d3577807909
* Choose right operator new/delete in case of multiple inheritance.Shimeng (Simon) Wang2010-05-261-0/+16
| | | | Change-Id: I5ae0c7ad9e06021a8149b5b70fdb20a0f0a8f4d8
* Merge WebKit at r59636: Fix conflictsKristian Monsen2010-05-252-108/+21
| | | | Change-Id: If40295eb42282bace49d422e4a24026ddac17cfe
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2578-1499/+2100
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1445-736/+1639
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Fix media element creationNicolas Roard2010-05-111-1/+1
| | | | Change-Id: I6545eab16de0c3355b188ffc643eec1f992877a2
* Merge webkit.org at r58033 : Cherry-pick WebKit change 58826 to add a ↵Steve Block2010-05-111-0/+1
| | | | | | | | missing PassRefPtr.h include See http://trac.webkit.org/changeset/58826 Change-Id: I00a2682dc0e9d9ca6cc9f3363b9f170075dd7817
* 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-114-114/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-11107-1000/+3348
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-05-071-0/+6
| | | | | | https://android-git.corp.google.com/g/#change,41406 Change-Id: Ief37a7d9879308f0749fcd569e82fddc3f989a8a
* Link prefetch supportLeon Clarke2010-05-043-74/+104
| | | | http://b/issue?id=2268353
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2716-126/+269
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* am ac90fdd7: Merge "Cherry pick http://codereview.chromium.org/1560007" into ↵Andrei Popescu2010-04-121-1/+1
|\ | | | | | | | | | | | | | | | | froyo Merge commit 'ac90fdd70d8a2f6051fdc959dac8edf5819f38bd' into froyo-plus-aosp * commit 'ac90fdd70d8a2f6051fdc959dac8edf5819f38bd': Cherry pick http://codereview.chromium.org/1560007
| * Cherry pick http://codereview.chromium.org/1560007Andrei Popescu2010-04-121-1/+1
| | | | | | | | | | | | Fix bug: 2588946 Change-Id: I80d144dd735e367bde8ba91ef0ab4ba3090da9d6
* | merge from open-source masterThe Android Open Source Project2010-04-021-8/+0
|\ \ | |/ |/| | | Change-Id: I87473a9657b8906b4933a7e22bf1125a65e44502
| * Remove some oboslete code.Julien Chaffraix2010-03-041-8/+0
| | | | | | | | | | traverseNextItem was renamed itemAfter and it can now deal with a NULL previous node.
* | Make sure html plugin element supports focus so thatGrace Kloba2010-03-312-0/+13
| | | | | | | | | | | | | | | | | | | | plugin can call focus() on it. By default, only nodes can be tabbed through supports focus. We make plugin element like frame element where it always supports focus. In Android, plugin has a focused mode, so it requires this change. Fix http://b/issue?id=2539608
* | Add a special case to handle "wap" style html.Grace Kloba2010-03-231-1/+1
| | | | | | | | | | | | | | | | If we get here, it is html mimetype, not wap mimetype. Treat the "wap" style like "mobile" style by using device-width as viewport width. Fix http://b/issue?id=2538320
* | Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1611-68/+180
| | | | | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* | Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1514-133/+197
| | | | | | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* | Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04178-871/+2383
| | | | | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* | Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-202-10/+6
| | | | | | | | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* | Cherry pick from Webkit for fix for ↵Ben Murdoch2010-01-121-1/+1
| | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=31539. Restore the default state of a textarea correctly. Change-Id: Id182817b7cd229e12676fd5ef55657ff6a963a4f
* | Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | webkit.org. setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32875 Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay. Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE. Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
* | Updates use of pow() in HTMLInputElement::stepMismatch() to match version ↵Steve Block2009-12-181-12/+2
| | | | | | | | | | | | | | | | upstreamed to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=32675 Change-Id: Ife24867a1c96a3b46226d06862198a2e6dfeb216
* | Fixes the build break in master.Steve Block2009-12-171-0/+10
| | | | | | | | | | | | | | The new WebKit merge caused a build break when auto-merged from eclair-mr2 to master, due to the fact that master uses stl_port. Change-Id: I1437352a3439f3e103572ed3e1bb523ec65e98ef
* | Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-54/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-17136-3699/+6852
| | | | | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* | Rollback to return density for scaleFactor.Grace Kloba2009-12-111-0/+24
| | | | | | Move the comment to HTMLCanvasElement and always use 1.0 there.
* | Pull down change 51321 from webkit.org.Patrick Scott2009-12-091-1/+1
| | | | | | | | | | Calls to EventNames() was causing multiple copies of the event names to be created. This could cause false negatives in hash map lookups.
* | Remove leading/trailing newlines and tabs as well as spaces from URLs.Ben Murdoch2009-11-181-1/+1
| | | | | | | | Change-Id: I0248ac1597fb0289ff34c346e6f92b3bd507ee39
* | Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1039-314/+724
| | | | | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* | fix instrumentation. The new WebKit has CachedResourceClientGrace Kloba2009-10-284-0/+60
| | | | | | | | derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
* | Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-223-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 : Remove stray definition of ↵Steve Block2009-10-201-1/+0
| | | | | | | | | | | | | | | | HTMLAnchorElement::isFocusable. This method has been removed in the new version of WebKit. However, the automatic merge did not remove the definition as it had been moved within Android's HTMLAnchorElement.h to make it public rather than private. Change-Id: I5956ba997d78dfa75729aa2836dc8d579b3eacb3
* | Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-202-12/+0
| | | | | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20146-1463/+7208
| | | | | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* | Remove the Android guards added to the <video> implementation in WebCore. Do ↵Andrei Popescu2009-10-142-12/+3
|/ | | | | | | | not merge. The patch in https://bugs.webkit.org/show_bug.cgi?id=29133 landed. This has already been submitted to master branch.
* Merge change Ic0bd5009 into eclairAndroid (Google) Code Review2009-09-302-0/+14
|\ | | | | | | | | * changes: Update <video> implementation after new IRC discussion with Eric Carlsson.
| * Update <video> implementation after new IRC discussion with Eric Carlsson.Andrei Popescu2009-09-302-0/+14
| | | | | | | | | | | | | | | | - move poster drawing on the WebKit side - get rid of the child views - add prepareToPlay method to the MediaPlayer iface. Fixes http://b/issue?id=2156592
* | always update the WebTextView from the input elementCary Clark2009-09-301-7/+3
|/ | | | | | | Even if the input element doesn't have focus, synchronize the WebTextView if the pointers match. fixes http://b/issue?id=2096746
generated by cgit v1.1 at 2025-08-17 09:46:08 +0000