| 541af8dff4d592277d0f835deafaf728dad8bc57 |
|
18-May-2012 |
Mangesh Ghiware <mghiware@google.com> |
Revert part of "Fix iframe, ..."
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
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 9a8423b643a8ce99e5642f2548600f9125382e89 |
|
29-Feb-2012 |
John Reck <jreck@google.com> |
Fix iframe, for reals!
Change-Id: I588aa5709e7a3c2ced9479c3cf9c1827bf6f7733
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 |
|
10-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| e7913fbdd6f145fe1644c90c22aa73cb733c9e17 |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Fix conflicts.
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
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| 5b8c725c6846b6f59ba9a5e6f562774f74046622 |
|
09-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Fix conflicts
- 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
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/page/DOMWindow.cpp
|