Fix canvas drawSystemFocusRing in focus event handler.

Source/core/html/canvas/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 2324 matching lines @@
     attributes->setAlpha(m_hasAlpha);
     return attributes.release();
 }
 
 void CanvasRenderingContext2D::drawSystemFocusRing(Element* element)
 {
     if (!focusRingCallIsValid(m_path, element))
         return;
 
     updateFocusRingAccessibility(m_path, element);
-    if (element->focused())
+    // Note: we need to check document->focusedElement() rather than just calling
+    // element->focused(), because element->focused() isn't updated until after
+    // focus events fire.
+    if (element->document() && element->document()->focusedElement() == element)
         drawFocusRing(m_path);
 }
 
 bool CanvasRenderingContext2D::drawCustomFocusRing(Element* element)
 {
     if (!focusRingCallIsValid(m_path, element))
         return false;
 
     updateFocusRingAccessibility(m_path, element);
 
@@ skipping 45 matching lines @@
     Color focusRingColor = RenderTheme::focusRingColor();
     const int focusRingWidth = 5;
     const int focusRingOutline = 0;
     c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor);
     didDraw(path.boundingRect());
 
     c->restore();
 }
 
 } // namespace WebCore