git.osdn.net Git - android-x86/external-webkit.git/commit

author	Steve Block <steveblock@google.com>
	Thu, 8 Jul 2010 12:18:23 +0000 (13:18 +0100)
committer	Steve Block <steveblock@google.com>
	Fri, 9 Jul 2010 14:33:40 +0000 (15:33 +0100)
commit	919eb425b73bb532c128aa974a43e3c959c5a10a
tree	8909107d3bed438c3fcf8bbc8f8ea6830f680198	tree \| snapshot
parent	ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24	commit \| diff

Merge WebKit at r62496: Fix conflicts

HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033
FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135
Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284
DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124
RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104

Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3

WebCore/html/HTMLDocumentParser.cpp		diff \| blob \| history
WebCore/page/FrameView.cpp		diff \| blob \| history
WebCore/page/Settings.cpp		diff \| blob \| history
WebCore/page/Settings.h		diff \| blob \| history
WebCore/platform/DragData.h		diff \| blob \| history
WebCore/platform/android/RenderThemeAndroid.cpp		diff \| blob \| history
WebCore/platform/android/RenderThemeAndroid.h		diff \| blob \| history