summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/css
Commit message (Collapse)AuthorAgeFilesLines
* Cherrypick WebKit r94508.Victoria Lease2012-05-046-4/+32
| | | | | | | | | | http://trac.webkit.org/changeset/94508 This, in conjunction with WebKit r95959, addresses our issue involving referencing deleted fonts. Bug: 6105670 Change-Id: Ica4c89046ed47e2c75d13640a27ac92f2aad6709
* Cherry-pick WebKit change r88472 to fix a rendering crashSteve Block2012-04-271-1/+4
| | | | | | | See http://trac.webkit.org/changeset/88472 Bug: 6293530 Change-Id: I10bf2dfc6354d4e074a131e937aad04e0e6ca353
* Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"Teng-Hui Zhu2012-04-161-13/+9
| | | | | | | | | | This was causing HTML5 video to crash. bug:6342146 This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e. Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
* Cherry-pick WebKit change r106251 to fix a LayoutTest crashSteve Block2012-04-121-1/+2
| | | | | | | | | fast/css/fontsize-unit-rems-crash.html See http://trac.webkit.org/changeset/106251 Bug: 6329315 Change-Id: I2d4208a280f71dcd2d69f5d34fae9604680abb58
* Cherry-pick WebKit change r96122 to fix a LayoutTest crashSteve Block2012-04-121-0/+5
| | | | | | | | | fast/canvas/crash-set-font.html See http://trac.webkit.org/changeset/96122 Bug: 6328797 Change-Id: I9d9fdbffb19e61615d352c20e24946cf01306903
* Cherry-pick WebKit change r94215 to fix a LayoutTest crashSteve Block2012-04-121-0/+2
| | | | | | | | | fast/gradients/css3-radial-gradient-crash.html See http://trac.webkit.org/changeset/94215 Bug: 6328935 Change-Id: I4414885e54a60aa05346c002c40835334685b1cb
* Cherry-pick WebKit change r92139 to fix a LayoutTest crashSteve Block2012-04-121-9/+13
| | | | | | | | | | | | editing/input/search-field-crash-in-designmode.html Manually resolved a merge conflict in CSSStyleSelector::isAtShadowBoundary() due to http://trac.webkit.org/changeset/88476. See http://trac.webkit.org/changeset/92139 Bug: 6329073 Change-Id: If869bd58a689bb918ef47048c4f5d2e84e4b6f89
* Cherry-pick WebKit change r85267 as a prerequisite for r92139Steve Block2012-04-121-1/+2
| | | | | | | See http://trac.webkit.org/changeset/85267 Bug: 6329073 Change-Id: I7c46eab459647059890732214a9b953adef0a647
* Cherry-pick WebKit change r88474 to fix a LayoutTest crashSteve Block2012-04-121-1/+2
| | | | | | | | | fast/css/webkit-keyframes-crash.html See http://trac.webkit.org/changeset/88474 Bug: 6328781 Change-Id: I9ae7d323b48ff6e55c720595fd27249176e87b8f
* take proper credit for overflow scrolling supportVictoria Lease2012-03-012-0/+5
| | | | | | Bug: 5771391 Change-Id: I3072fd1e9ad7b0ab9d3f6beac84c125d1930024f
* Fix the wrong button for html5 audioTeng-Hui Zhu2012-02-031-4/+1
| | | | | | | | | Currently the mute button is showing up as a pause button wrongly. We can safely disable it for now. bug:5964086 Change-Id: Ifb26bd4d1a2e9d3ae9a758488627b345df7a44dd
* Remove ANDROID_CSS_RINGJohn Reck2012-01-185-221/+1
| | | | Change-Id: I7395a5f17b0ccfe8dafcc97fa3ab8897676608e9
* Remove changes with upstream WebKitKristian Monsen2011-11-171-1/+0
| | | | | | | | | | Fix for bug 5626884, removing some small changes with upstream that was spotted as part of CL: https://android-git.corp.google.com/g/#/c/148917 No functional difference. Change-Id: I62c8a24e17c3ab86eebff997b87e5bced88e0807
* Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-175-129/+0
| | | | | | | | | | | | | | This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
* Cherry-pick WebKit change 87687 to fix debug buildSteve Block2011-10-281-0/+1
| | | | | | | See http://trac.webkit.org/changeset/87687 Bug: 5448972 Change-Id: I1f2da8f5a2264ce6627dc99ebe1b235ae34f7c62
* Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.Ben Murdoch2011-07-131-0/+3
| | | | | | Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-1410-145/+33
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge "Ignore webkit-text-size-adjust: none"John Reck2011-06-131-0/+13
|\
| * Ignore webkit-text-size-adjust: noneJohn Reck2011-06-131-0/+13
| | | | | | | | | | | | Bug: 4486008 Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
* | Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform.h ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997) WTF_USE_SKIA (http://trac.webkit.org/changeset/84106) JSNavigatorCustom.cpp V8NavigatorCustom.cpp ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287) CSSStyleSelector.cpp ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986) Document.cpp ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349) ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992) HTMLInputElement.cpp ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534) RangeInputType.cpp ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/) ChromeClient.h ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375) EventHandler.cpp PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522) Settings ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201) ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628) Gradient.cpp Graphicscontext.cpp HTMLCanvasElement.cpp USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088) USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101) PluginView.h ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071) RenderBox.h ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611) RenderIframe.cpp (moved code to RenderPart.cpp) PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518) RenderLayer.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899) RenderLayer.h RenderLayerBacking.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820) Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
* | Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-1026-560/+651
| | | | | | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* | Merge WebKit at r82507: Fix conflictsSteve Block2011-06-082-68/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - RenderLayerBacking.cpp Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81715 - Document.cpp Due to domTreeVersion and ANDROID_STYLE_VERSION http://trac.webkit.org/changeset/80797 - CachedResourceLoader.cpp Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE http://trac.webkit.org/changeset/80695 - Settings.cpp/h http://trac.webkit.org/changeset/81289 http://trac.webkit.org/changeset/81635 - MediaPlayer.cpp Whitespace only http://trac.webkit.org/changeset/80874 - RenderBox.cpp Due to isHorizontalWritingMode http://trac.webkit.org/changeset/81716 - RenderLayer.cpp/h Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81981 - CSSStyleSelector.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/80993 http://trac.webkit.org/changeset/80998 http://trac.webkit.org/changeset/81684 http://trac.webkit.org/changeset/82378 - CSSParser.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/81684 - StyleElement.cpp Due to cherry pick of http://trac.webkit.org/changeset/80787 http://trac.webkit.org/changeset/82054 - EventHandler.cpp Due to ANDROID_PLUGINS http://trac.webkit.org/changeset/81618 http://trac.webkit.org/changeset/81835 - SliderThumbElement.cpp Due to touch events http://trac.webkit.org/changeset/81216 - MediaControls.cpp Due to touch events http://trac.webkit.org/changeset/80857 Note that the WebKit history for this file is confusing as it was renamed in http://trac.webkit.org/changeset/83545 and then re-added in http://trac.webkit.org/changeset/84222 but trac is not smart enough to track history backwards from http://trac.webkit.org/changeset/84222. Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
* | Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-0835-410/+1759
| | | | | | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* | Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cppBen Murdoch2011-06-022-48/+18
| | | | | | | | | | | | | | Update our uses of CSSPrimitiveValue following http://trac.webkit.org/changeset/80463 Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
* | Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0226-1026/+1575
|/ | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-2442-741/+1047
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2320-234/+417
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-1618-104/+421
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-122-0/+168
| | | | | | | | | | | | | This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12195-0/+44036
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-08 02:59:46 +0000