Merge commit '61f4e2b44e5fee639fb4e97b6d54acfa313925f7' into HEAD

* commit '61f4e2b44e5fee639fb4e97b6d54acfa313925f7':
  Merge WebKit at r59636: Update WebKit version
  Do not try to show pdf's in the browser.
  Merge WebKit at r59636: Variable changed to method upstream http://trac.webkit.org/changeset/59576/trunk/WebCore/loader/CachedResource.h#file0
  Merge WebKit at r59636: Added header needed for Android
  Merge WebKit at r59636: Method name changed upstream http://trac.webkit.org/changeset/59227/trunk/WebCore/html/HTMLLabelElement.h#file0
  Merge WebKit at r59636: Fix Android ifdef, commas moved upstream. http://trac.webkit.org/changeset/59035/trunk/WebCore/bridge/npapi.h#file0
  Merge WebKit at r59636: Fix makefiles
  Merge WebKit at r59636: Fix conflicts
  Merge WebKit at r59636: Initial merge by git
  First draft to add a fat point to WebKit hit test.
  Only set extra_layout_delay if the loader is not completed yet.

Conflicts:
	WebCore/dom/Document.h
	WebCore/html/HTMLLinkElement.cpp
Update to use system/core/include 4.2.2_r1.2

Conflicts:
	WebCore/loader/ProgressTracker.cpp
	WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
	WebKit/mac/WebView/WebDataSource.mm
	WebKit/mac/WebView/WebHTMLView.mm

Conflicts:
	WebKit/android/nav/WebView.cpp

Conflicts:
	JavaScriptCore/wtf/Assertions.h
	WebCore/plugins/mac/PluginViewMac.cpp
	WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm
Update to use binary.mk 4.3_r2.1
Fix build