summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLOptionElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-1/+1
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-5/+0
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-5/+0
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-3/+3
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-1/+10
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* 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-141-0/+4
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-10/+31
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-2/+5
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-2/+8
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-1/+1
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-1/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-5/+5
|
* Merge commit 'goog/master-webkit-merge' into webkit-merge-44544Feng Qian2009-06-181-24/+9
|\
| * Get WebKit r44544.Feng Qian2009-06-171-24/+9
| |
* | am fa67f45c: Fix WebKit keygen. Has submitted the change to webkit as bug 26016.Grace Kloba2009-06-181-0/+4
|\ \ | |/ |/| | | | | | | | | Merge commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b' * commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b': Fix WebKit keygen. Has submitted the change to webkit as bug 26016.
| * Fix WebKit keygen. Has submitted the change to webkit as bug 26016.Grace Kloba2009-06-181-0/+4
| |
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-4/+7
|/ | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-51/+26
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+262
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-262/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-31/+35
|
* Initial ContributionThe Android Open Source Project2008-10-211-2/+2
|
* external/webkit r30707Upstream1970-01-121-0/+258
generated by cgit v1.1 at 2025-05-31 20:55:56 +0000