summaryrefslogtreecommitdiffstats
path: root/WebCore/css
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-201-4/+1
| | | | | | | | | | | | | | | | | | | | Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2029-85/+196
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-095-96/+152
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0220-51/+601
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1625-107/+445
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-085-15/+59
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* 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-2712-232/+256
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2513-89/+246
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-142-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1433-170/+665
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1132-737/+1221
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-05-071-0/+134
| | | | | | https://android-git.corp.google.com/g/#change,41406 Change-Id: Ief37a7d9879308f0749fcd569e82fddc3f989a8a
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-274-18/+33
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Cherry pick http://codereview.chromium.org/1549001Andrei Popescu2010-04-121-7/+4
| | | | | | Fix bug: 2588926 Change-Id: I4d077f109c3b415e1a0fa4765e939bea3b56f7fc
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1611-190/+279
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-1/+2
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0458-431/+669
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1747-170/+283
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1016-70/+213
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* fix instrumentation. The new WebKit has CachedResourceClientGrace Kloba2009-10-284-8/+52
| | | | derived from FastAllocBase which has overload operator new. So we need to override it again to avoid ambiguous.
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2043-250/+1135
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1918-191/+50
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1818-50/+191
|
* dom, html and loader mergesAndrei Popescu2009-08-121-38/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1155-578/+1355
|
* resolved conflicts for merge of dac9d5be to masterGrace Kloba2009-06-292-10/+58
|\
| * Add JavaScript parsing into instrumentation. Also modify css parsing ↵Grace Kloba2009-06-262-10/+58
| | | | | | | | calculations.
* | Get WebKit r44544.Feng Qian2009-06-1731-306/+525
| |
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-1030-455/+1106
|/ | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0579-1203/+3062
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03166-0/+33601
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03166-33601/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-27/+3
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17133-6063/+11614
|
* Initial ContributionThe Android Open Source Project2008-10-2140-995/+908
|
* external/webkit r30707Upstream1970-01-12135-0/+28161
generated by cgit v1.1 at 2025-11-30 22:33:10 +0000