summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/dom
Commit message (Collapse)AuthorAgeFilesLines
* Cherrypick WebKit r95959.Victoria Lease2012-05-071-1/+7
| | | | | | | | | | http://trac.webkit.org/changeset/95959 This, in conjunction with WebKit r94508, addresses our issue involving referencing deleted fonts. Bug: 6105670 Change-Id: Ida486c92d33aee792486f49e784f64d978e2fb81
* Cherrypick WebKit r94508.Victoria Lease2012-05-042-1/+26
| | | | | | | | | | 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 r90130 to fix a rendering crashSteve Block2012-04-271-16/+21
| | | | | | | See http://trac.webkit.org/changeset/90130 Bug: 6328929 Change-Id: Iee0df9f81e1b73de0e1922b3b24e224389db8fa3
* Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"Teng-Hui Zhu2012-04-161-1/+1
| | | | | | | | | | This was causing HTML5 video to crash. bug:6342146 This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e. Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
* Cherry-pick WebKit change r94511 to fix a LayoutTest crashSteve Block2012-04-121-5/+10
| | | | | | | | | fast/dom/Range/range-delete-contents-event-fire-crash.html See http://trac.webkit.org/changeset/94511 Bug: 6329028 Change-Id: I00cc0e6520831f20f6177f18f4e86d471003ea58
* Cherry-pick WebKit change r92139 to fix a LayoutTest crashSteve Block2012-04-121-1/+1
| | | | | | | | | | | | 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 r87227 as a prerequisite for r92139Steve Block2012-04-122-7/+7
| | | | | | | See http://trac.webkit.org/changeset/87227 Bug: 6329073 Change-Id: I18c371c96547d5a2011847647c8fc398b0adb18d
* Cherry-pick WebKit change r85267 as a prerequisite for r92139Steve Block2012-04-122-1/+3
| | | | | | | See http://trac.webkit.org/changeset/85267 Bug: 6329073 Change-Id: I7c46eab459647059890732214a9b953adef0a647
* Fix content detector crashesJohn Reck2012-02-271-4/+9
| | | | | | | | Bug: 6075831 Add some sanity checks to AndroidHitTestResult Update DOMTextContentWalker to latest which had some extra checks Change-Id: If6d129e78712c8cfc5ec84e48487e32cc585680f
* Delete CacheBuilderJohn Reck2012-02-241-5/+0
| | | | | | Fixed address_detector to pass CTS Change-Id: I6e3c4146d4c03881d036be9b8d8708a8200efef8
* Support address detectionJohn Reck2012-02-232-0/+150
| | | | Change-Id: I88b6ebfb4c967e954a2420592a58af3ed188226d
* Merge "Move Android specific code inside the ANDROID_META_SUPPORT ifdef."Mangesh Ghiware2011-11-231-1/+1
|\
| * Move Android specific code inside the ANDROID_META_SUPPORT ifdef.Mangesh Ghiware2011-11-221-1/+1
| | | | | | | | | | | | Fixes bug 5626822: Unguarded WebCore CL Change-Id: Ic150cb72830d59b2d31c132cd65bb4a388e3f9d0
* | Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-175-87/+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
* am c97291b2: Merge "Add necessary null pointer check to avoid crash on ↵Teng-Hui Zhu2011-11-101-0/+4
|\ | | | | | | | | | | | | youtube video" into ics-mr1 * commit 'c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90': Add necessary null pointer check to avoid crash on youtube video
| * Add necessary null pointer check to avoid crash on youtube videoTeng-Hui Zhu2011-11-081-0/+4
| | | | | | | | | | bug:5562347 Change-Id: I9b53a58137d70955bde5334c7c8b581343a8c2ce
* | Cherry-pick WebKit change 87687 to fix debug buildSteve Block2011-10-281-0/+2
|/ | | | | | | See http://trac.webkit.org/changeset/87687 Bug: 5448972 Change-Id: I1f2da8f5a2264ce6627dc99ebe1b235ae34f7c62
* Add temporary work-around to allow loading local data from Documents with ↵Steve Block2011-09-261-1/+7
| | | | | | | | | | | | | | | substituted data This is a temporary workaround for a WebCore bug which is awaiting resolution. See https://bugs.webkit.org/show_bug.cgi?id=68711 and this bug for details. This change adds a new property to Frame to track when its Document pointer is up-to-date. This is is used only when setting up the securty context for a Document with substituted data and allows us to skip the buggy check in Document::loader(). Bug: 5188895 Change-Id: I5d7d2cca83fa0c6db084d505f5b48207046a9cd0
* Merge "Fix the poster issue and full screen behavior html5 video"Teng-Hui Zhu2011-09-121-2/+16
|\
| * Fix the poster issue and full screen behavior html5 videoTeng-Hui Zhu2011-09-121-2/+16
| | | | | | | | | | | | | | | | | | | | This is related to the change in https://bugs.webkit.org/show_bug.cgi?id=49481, and it seems there is some following up discussion in this area. We will just follow what we did from Honeycomb and work around issues for now. bug:4523481 Change-Id: I3c2225afb078c24db423119a235266f222055431
* | Fix logic error in Android style version calculation.Ben Murdoch2011-09-061-2/+6
|/ | | | | | | | | | We need to update the style version on a width or height change, and also detect a transition from display:none to display:something (and vice versa) in which case WebKit will pass the display:none style as a null pointer. Bug: 5137070 Change-Id: I82fa3fbe990cfc4c733a2f4fed8be37f11e44ba4
* Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.Ben Murdoch2011-07-134-16/+52
| | | | | | Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
* meta format-detection is not a viewport meta tag.Shimeng (Simon) Wang2011-07-012-1/+17
| | | | | | | | This reverts some of my previous change which wrongly treats format-detection as a viewport change. issue: 4975315 Change-Id: Icb3ab9b813010b253a59fca6992deb1aa4d186e7
* Update viewport using webkit's way.Shimeng (Simon) Wang2011-07-012-22/+2
| | | | | | | | | The Android's customized way of parsing viewport meta tags is kept intact; while the viewport update notification mechanism is changed to use webkit's way. This gives much better notification of viewport switching. issue: 4975315 Change-Id: I7896b67d684efec015245ee804a9243e72ff0b50
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-147-20/+35
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-101-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1072-819/+1524
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Fix conflictsSteve Block2011-06-083-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-0853-706/+1468
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0249-749/+1417
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-251-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-2441-457/+779
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2341-87/+454
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Fix conflicts.Ben Murdoch2011-05-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StyleElement.cpp Do not undo cherry pick of http://trac.webkit.org/changeset/80787 Conflict due to intermediate change http://trac.webkit.org/changeset/75338 SliderThumbElement.cpp Conflict due to Android TOUCH_EVENTS addition and http://trac.webkit.org/changeset/75749 DOMWindow.cpp Conflict due to clearDomStorage and http://trac.webkit.org/changeset/75739 Page.cpp Conflict due to Android APPLICATION_INSTALLED addition and http://trac.webkit.org/changeset/75604 DragData.h See http://trac.webkit.org/changeset/75523 RenderBox.cpp Conflict due to PLATFORM_ANDROID addition and http://trac.webkit.org/changeset/75837 .gitignore - keep ours RenderSVGSolidColor.cpp This file moved, so copy over our edits. Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-1621-74/+126
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-122-0/+1221
| | | | | | | | | | | | | 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-12310-0/+49432
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84