summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/page/DOMWindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert part of "Fix iframe, ..."Mangesh Ghiware2012-05-181-0/+16
| | | | | | | | | | Fix DOMWindow innerWidth and innerHeight to report correct values even after an orientation change. Uses platform-specific widget. This reverts part of commit I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733. Bug: 6479900 Change-Id: Ic5c8785e35b14d6723eee4f4dfe1b0a3e1ec284a
* Fix iframe, for reals!John Reck2012-03-011-16/+0
| | | | Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-141-7/+14
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-3/+18
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-9/+22
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-4/+30
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-23/+16
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-0/+22
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Fix conflicts.Ben Murdoch2011-05-161-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-25/+19
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Fix conflictsSteve Block2011-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-121-0/+1861
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2025-06-03 07:21:53 +0000