summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering
Commit message (Collapse)AuthorAgeFilesLines
* 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 "Don't force composited layers to be stacking contexts"Chris Craik2011-10-241-1/+1
|\
| * Don't force composited layers to be stacking contextsChris Craik2011-10-211-1/+1
| | | | | | | | | | | | | | | | bug:5264240 Was causing crashes, and layer ordering problems. Change-Id: I1f76516d4e313101ea9c90759ee63d4cef2d6ced
* | Cherry pick 97075John Reck2011-10-204-27/+15
| | | | | | | | | | | | Bug: 5491444 Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
* | Cherry pick 94857John Reck2011-10-201-2/+7
|/ | | | | | Bug: 5491573 Change-Id: I32666ca6abdc2e224e6b9727f65e62fd3bd10859
* Cherry-pick WebKit change 89836 to fix a crash due to floats not being removedSteve Block2011-10-141-0/+3
| | | | | | | | | This is part 2 of 2 of the fix. See http://trac.webkit.org/changeset/89836 Bug: 5249309 Change-Id: If23a41a8e75e5fb6ba9e84e481ca44a319f678ef
* Cherry-pick WebKit change 89165 to fix a crash due to floats not being removedSteve Block2011-10-142-4/+39
| | | | | | | | | This is part 1 of 2 of the fix. See http://trac.webkit.org/changeset/89165 Bug: 5249309 Change-Id: I1159aab70e1fa6d3025761423c4164682dc97b64
* allow for compositing of 1x1 pluginsChris Craik2011-10-031-0/+6
| | | | | | bug:5382635 Change-Id: I0da21245ec7808da452941a45ae5008e278f3007
* Roll back fix for http://b/issue?id=4203823Ben Murdoch2011-09-081-4/+1
| | | | | | | | | | Allow positioned divs with overflow to scroll. Keeps tidying up that fix for http://b/issue?id=4203823 did and rolls back the functional change. Bug: 5216561§ Change-Id: I6268bbe880c432c87ca04e68697f66b32b7032d0
* Cherry-pick WebKit change 92744 to fix RenderObjectChildListSteve Block2011-09-071-1/+1
| | | | | | | See http://trac.webkit.org/changeset/92744 Bug: 5263877 Change-Id: I672c48d3fb6dc90d0721b6c5638070eb944596f4
* Cherry-pick WebKit change 85623 to fix RenderInline::culledInlineAbsoluteQuads()Steve Block2011-09-061-0/+5
| | | | | | | See http://trac.webkit.org/changeset/85623 Bug: 4986300 Change-Id: If557cbd8c6914dc6875b87cfe04591f9bfa42047
* Incorrect handling of 'display:' property within nested <ruby> tagsSteve Block2011-09-021-14/+34
| | | | | | | | This is a cherry-pick of http://trac.webkit.org/changeset/89987 Bug: 5244760 Change-Id: Iebbac8a93d6aabd0f8d568c9b1ace6f9316a6b6c
* Remove some unsafe static_cast in rendering/Steve Block2011-09-021-4/+4
| | | | | | | | | | | This is a partial cherry-pick of http://trac.webkit.org/changeset/89304 It is required to allow us to cherry-pick http://trac.webkit.org/changeset/89987 Bug: 5244760 Change-Id: I854067cbc297e667ec432f947a268eef5c4dfa0f
* Part of fix for bug 5152544 Reduce the number of warning, int and size_tKristian Monsen2011-08-111-3/+3
| | | | | | Don't compare and use size_t with int Change-Id: I08b329cdb192fa031acae5a90cd6ad6d8ec39aea
* Previous commit was missing a chunk of code...Nicolas Roard2011-08-081-0/+3
| | | | | bug:5121768 Change-Id: Ie0065bca023b9a8470970ba15f5837f600fe4afb
* Fix crashes on plus.google.com and reduce the number of necessary layersNicolas Roard2011-08-051-4/+20
| | | | | bug:5121768 Change-Id: I616af5cdc3f8b0a790fd50434c919b2c95b0e486
* Reduce the number of layersNicolas Roard2011-07-294-39/+112
| | | | | | | | | | | | - overflow elements triggered all layers before them to be composited; this is not needed at all... - fixed elements will trigger layers after them to be composited, but we don't need to composite all of them -- the one fully contained into previous composited layers don't need to... bug:5069090 Change-Id: I65f789f490b837a16096b4cb186c45ade1605b41
* Refactor the overflow scroll fix.Shimeng (Simon) Wang2011-07-251-7/+10
| | | | | | | Hope this is more understandable. issue: 4203823 Change-Id: Ib1d95f6b250baf4b94f706e090a9f087aa9b7ed8
* Disable customized overflow scroll for positioned renderblock.Shimeng (Simon) Wang2011-07-251-4/+7
| | | | | | | | | | This fixes maps.google.com dropdown list scrolling issue. Tested on developer.android.com, slate.com, lemonde.fr; the existing overflow scrolling are working as before this change. issue: 4203823 Change-Id: I11cebbfd8bb3dd060bbee1b29ec96627fcbf1a72
* Limit RTL text wrapping when having floating element.Shimeng (Simon) Wang2011-07-211-1/+1
| | | | | issue: 5047703 Change-Id: Ie7d9bb54649afb4d025d4ec02bcc42b52b4049d1
* Add android specific virtual function to GraphicsLayerClient.Shimeng (Simon) Wang2011-07-142-9/+3
| | | | | | | | | | | | | | | This lets the GraphicsLayerClient instance decides whether it has owning RenderLayer, instead of using static_cast. This makes overflow'ed iframe scrollable again. This change also reverts Tenghui's CL: https://android-git.corp.google.com/g/#change,115508 Tested on scrollable iframe and inline video. issue: 4902019 Change-Id: I252f5432b0750c5cac0a4404663e1730ef006cfc
* Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.Ben Murdoch2011-07-132-13/+23
| | | | | | Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
* Better way to determine not to reflow.Shimeng (Simon) Wang2011-06-231-2/+2
| | | | | | | | | Instead of using border which may be too broad, using whether an object is floating to fix flickr's reflow issue. Checked sites like slashdot.org and nytimes.com, this works better. issue: 4596265 Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
* Do not reflow text if a div has border.Shimeng (Simon) Wang2011-06-231-1/+1
| | | | | | | | This also fixes the case where flickr header's position is not good since it's reflowed for issue 4596265. issue: 4596265 Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
* Remove old customized code.Shimeng (Simon) Wang2011-06-211-7/+0
| | | | | | | | | | | | This fixes slashdot.org after recent webkit merge, since the removed code will sometimes require extra layout. This code is two years old, and related to iframe flattening, which is not used any more in Android. Android still does frameset flattening. Verified sites such as developer.android.com are still working. issue: 4753055 Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510
* Fix the crash caused by recent webkit RenderLayerCompositor changeTeng-Hui Zhu2011-06-151-0/+9
| | | | | | | | | | | | We used to rely on the fact that RenderLayerBacking is the only subclass of GraphicsLayerClient, but now the RenderLayerCompositor also inherit it and is used for iframe. That cause us to get invalid pointer in GraphicsLayerAndroid. The solution here is to disable the new webkit approach b/c we have our own iframe support already. bug:4592195 Change-Id: Ia786233907d83028fdc6865c28fbbd5291564ad0
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-1425-149/+241
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Fix RenderLayerCompositor.cppBen Murdoch2011-06-101-5/+1
| | | | | | | | | iframe compositing propogation now works for <object> and framesets so the methods have been renamed - implement that renaming in our code. See http://trac.webkit.org/changeset/83518 Change-Id: Id1fd6d47f5ac4546f6eddf443658b4b481542292
* Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-106-72/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10126-4412/+3815
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Fix conflictsSteve Block2011-06-084-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-08105-1427/+3305
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Update RenderLayer.cpp with upstreamed version of crash fixSteve Block2011-06-021-9/+3
| | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=56107 Bug: 4026385 Change-Id: I381b0d1ee115cd6eda92136d150b8cf7e33558ac
* Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-021-5/+1
| | | | | | | | | PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
* Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-023-98/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Font rounding hacks have been removed upstream, so there is no need for our local code anymore. Remove all uses of the ANDROID_DISABLE_ROUNDING_HACKS macro. Note that this brings our behavior in line with upstream - Android will see a change in behavior to before the merge as we did not disable rounding hacks in all cases. - SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for disableRoundingHacks, so we don't disable hacks, so this behaviour will change as rounding hacks are disabled now. - RenderText::createTextBox() - We pass a value for disableRoundingHacks, true if any parent is a text control. So we will change behavior in any case where the parent is not a text control. Note that although we may see a change in behavior, that change is consistent with the upstream codebase. See http://trac.webkit.org/changeset/78846 Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
* Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-021-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk 79223 Conflict due to http://trac.webkit.org/changeset/79223 Android.mk Conflicts due to http://trac.webkit.org/changeset/79825 and http://trac.webkit.org/changeset/79978 Android.v8bindings.mk 80367 Conflicts due to http://trac.webkit.org/changeset/80103 and http://trac.webkit.org/changeset/80367 HTMLMediaElement.cpp Conflicts due to http://trac.webkit.org/changeset/80030 and local TOUCH_EVENTS modifications. HTMLDocumentParser.cpp Conflict due to http://trac.webkit.org/changeset/79772 and local ANDROID_INSTRUMENT modifications. CachedResourceLoader.cpp|h Conflicts due to http://trac.webkit.org/changeset/78602 and ANDROID_BLOCK_NETWORK_IMAGE. MemoryCache.h Conflicts due to http://trac.webkit.org/changeset/78848 and ANDROID_INSTRUMENT. FrameView.cpp Conflict due to http://trac.webkit.org/changeset/78928 and locally added updatePositionedObjects function. NetworkStateNotifier JobjectWrapper.cpp Git seems to have got confused with a rename here in JobjectWrapper.cpp, keep ours. Conflicts due to http://trac.webkit.org/changeset/79563 and local Android additions. PluginViewNone.cpp 79904 Conflicts due to http://trac.webkit.org/changeset/79904 and local cherry pick of http://trac.webkit.org/changeset/79988 RenderBox.cpp Conflicts due to http://trac.webkit.org/changeset/79467 and local android modifications. Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-02104-2117/+2555
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge changes ↵Steve Block2011-05-25120-1975/+2628
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f * changes: Merge WebKit at r78450: Update ThirdPartyProject.prop Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText() Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed Merge WebKit at r78450: HTMLAreaElement::getRect() renamed Merge WebKit at r78450: FrameLoader::url() removed Merge WebKit at r78450: HTMLParserQuirks removed Merge WebKit at r78450: TextRun::padding() renamed Merge WebKit at r78450: Use new FontMetrics Merge WebKit at r78450: GraphicsContext current path removed Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed Merge WebKit at r78450: IntRect::bottom()/right() renamed Merge WebKit at r78450: Fix remaining conflicts Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard Merge WebKit at r78450: Fix conflicts in media controls Merge WebKit at r78450: Fix Makefiles Merge WebKit at r78450: Initial merge by git.
| * Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-251-1/+1
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
| * Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-252-52/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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: Fix conflicts in media controlsSteve Block2011-05-253-421/+2
| | | | | | | | | | | | | | Conflict due to Android modifications to handle touch events. See http://trac.webkit.org/changeset/76950 Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
| * Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-24120-1557/+2664
| | | | | | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* | Don't change website's content width.Shimeng (Simon) Wang2011-05-241-4/+0
|/ | | | | | | | This code is not needed since now fixed viewport is used for all devices including phone. issue: 4343683 Change-Id: I885eae15d30fc5f3f8f3855febc1d98cf6554c93
* Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-231-2/+17
| | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk Conflict due to local addition of EntrySyncCustom.cpp and http://trac.webkit.org/changeset/76216 V8NPUtils.cpp Conflict due to local cherry pick of http://trac.webkit.org/changeset/78994 and merge of http://trac.webkit.org/changeset/76264 FrameView.h Conflict due to local addition of updatePositionedObjects() and http://trac.webkit.org/changeset/76278 RangeInputType.cpp SliderThumbElement.cpp Conflicts due to Android addition of touch handling code in slider code. See http://trac.webkit.org/changeset/76147 .gitignore - keep ours Change-Id: I38aeb361a37e7939f805c6689d7cc8fc720b3e52
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2392-1133/+739
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Fix conflicts.Ben Murdoch2011-05-163-100/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-16175-1021/+3710
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Fix conflictsSteve Block2011-05-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - HTMLInputElement.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS See http://trac.webkit.org/changeset/74895 - HTMLInputElement.cpp and RangeInputType.cpp Conflict due to refactoring of event handling on input elements See http://trac.webkit.org/changeset/74549 - DOMWindow.cpp Conflict due to DOMWindow::clearDOMStorage() See http://trac.webkit.org/changeset/74800 - EventHandler.cpp Conflict due to longpress and doubletap vs touch event refactoring See http://trac.webkit.org/changeset/74553 - History.cpp Trivial conflict due to cherry-pick See http://trac.webkit.org/changeset/74853 - GraphicsContext.cpp Conflict due to PLATFORM(ANDROID) guard See http://trac.webkit.org/changeset/74662 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/74971 Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12369-0/+103531
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-07-29 05:53:04 +0000