29e85d2deb6296e95613c56b6c48f7c1b1fb65cf - platform/external/chromium_org/third_party/WebKit

commit	29e85d2deb6296e95613c56b6c48f7c1b1fb65cf	[log] [tgz]
author	Ben Murdoch <benm@google.com>	Thu Dec 04 19:18:55 2014 +0000
committer	Ben Murdoch <benm@google.com>	Thu Dec 04 19:18:55 2014 +0000
tree	8867b4ae89a6735b37cae1b653aac6ef8e5a3e5a
parent	b00cd162efebe8f732c9ce6835468808e6fd2691 [diff]

Merge from Chromium at DEPS revision 40.0.2214.27

This commit was generated by merge_to_master.py.

Change-Id: I57ad0614d66b57b2e97d2ed8042e9975272c0f72

ManualTests/resources/zh-hans.png[Added - diff]
ManualTests/resources/zh-hant.png[Added - diff]
ManualTests/zh-font-fallback-android.html[Added - diff]
Source/core/accessibility/AXObject.h[diff]
Source/core/accessibility/AXRenderObject.cpp[diff]
Source/core/accessibility/AXRenderObject.h[diff]
Source/core/css/CSSSelector.h[diff]
Source/core/css/RuleSet.cpp[diff]
Source/core/css/parser/BisonCSSParser-in.cpp[diff]
Source/core/css/parser/CSSParserValues.cpp[diff]
Source/core/dom/ScriptedAnimationController.cpp[diff]
Source/core/dom/ScriptedAnimationController.h[diff]
Source/core/editing/FrameSelection.cpp[diff]
Source/core/editing/FrameSelection.h[diff]
Source/core/editing/FrameSelectionTest.cpp[diff]
Source/core/frame/FrameView.cpp[diff]
Source/core/frame/PinchViewport.h[diff]
Source/core/html/HTMLMediaElement.cpp[diff]
Source/core/html/forms/FileInputType.cpp[diff]
Source/core/html/forms/FileInputTypeTest.cpp[diff]
Source/core/page/DragController.cpp[diff]
Source/core/page/DragData.cpp[diff]
Source/core/page/DragData.h[diff]
Source/core/paint/ImagePainter.cpp[diff]
Source/core/rendering/RenderBox.cpp[diff]
Source/core/rendering/RenderBox.h[diff]
Source/core/rendering/RenderFlexibleBox.cpp[diff]
Source/core/rendering/RenderImage.cpp[diff]
Source/core/rendering/RenderObject.cpp[diff]
Source/core/rendering/RenderView.cpp[diff]
Source/core/rendering/RenderView.h[diff]
Source/core/rendering/style/BorderData.h[diff]
Source/core/rendering/style/RenderStyle.cpp[diff]
Source/core/rendering/style/StyleDifference.h[diff]
Source/core/rendering/svg/RenderSVGImage.cpp[diff]
Source/core/rendering/svg/RenderSVGImage.h[diff]
Source/devtools/front_end/components/DOMPresentationUtils.js[diff]
Source/devtools/front_end/elements/ElementsPanel.js[diff]
Source/devtools/front_end/elements/ElementsTreeOutline.js[diff]
Source/devtools/front_end/elements/elementsPanel.css[diff]
Source/devtools/front_end/elements/elementsTreeOutline.css[diff]
Source/devtools/front_end/inspectorStyle.css[diff]
Source/devtools/front_end/splitView.css[diff]
Source/devtools/front_end/ui/SplitView.js[diff]
Source/devtools/front_end/ui/View.js[diff]
Source/platform/fonts/android/FontCacheAndroid.cpp[diff]
Source/platform/fonts/mac/FontPlatformDataMac.mm[diff]
Source/platform/graphics/Image.h[diff]
Source/web/ExternalPopupMenu.cpp[diff]
Source/web/ExternalPopupMenuTest.cpp[diff]
Source/web/LinkHighlight.cpp[diff]
Source/web/TextFinder.cpp[diff]
Source/web/WebAXObject.cpp[diff]
Source/web/WebLocalFrameImpl.cpp[diff]
Source/web/WebViewImpl.cpp[diff]
Source/web/WebViewImpl.h[diff]
Source/web/tests/PinchViewportTest.cpp[diff]
Source/web/tests/data/popup/select_mid_screen.html[Added - diff]
public/web/WebAXObject.h[diff]

59 files changed

tree: 8867b4ae89a6735b37cae1b653aac6ef8e5a3e5a

ManualTests/
PerformanceTests/
public/
Source/
Tools/
.clang-format
.gitattributes
.gitignore
.merged-revisions
codereview.settings
LICENSE
OWNERS
PRESUBMIT.py
WATCHLISTS