summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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 2025-10-26 23:40:57 +0000