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/History.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/History.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/History.cpp
|