Merge 185245 "Partially revert r181835 to fix link highlighting"

> Partially revert r181835 to fix link highlighting
> 
> The changes in LinkHighlight code in http://crrev.com/541913002 causes
> the link-highlights to disappear in many cases (see the bug). Eight
> changes have been committed to the same code afterwards, making it
> impossible to fully revert the target CL. The partial revert here fixes
> the problem.
> 
> BUG=430244
> 
> Review URL: https://codereview.chromium.org/719053004

TBR=mustaq@chromium.org

Review URL: https://codereview.chromium.org/720273002

git-svn-id: svn://svn.chromium.org/blink/branches/chromium/2171@185310 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Merge changes from 39.0.2171.71.

* Changes:
  Merge 185245 "Partially revert r181835 to fix link highlighting"
Merge pull request #36 from rakuco/m39.71

Merge changes for Chromium 39.0.2171.71.