4 files changed, 9 insertions, 12 deletions
diff --git a/DEPS b/DEPS
index 7c4c0d6..583193d 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@3882",
+    "/trunk/deps/third_party/WebKit@3957",
 
   "src/third_party/cygwin":
     "/trunk/deps/third_party/cygwin@3248",
diff --git a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
index 5ac7c3a..810d234 100644
--- a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
+++ b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
@@ -29,7 +29,6 @@
 #define WIN32_COMPILE_HACK
 
 MSVC_PUSH_WARNING_LEVEL(0);
-#include "Color.h"
 #include "SSLKeyGenerator.h"
 #include "KURL.h"
 #include "NotImplemented.h"
@@ -38,9 +37,6 @@ MSVC_POP_WARNING();
 
 using namespace WebCore;
 
-Color WebCore::focusRingColor() { notImplemented(); return 0xFF7DADD9; }
-void WebCore::setFocusRingColorChangeFunction(void (*)()) { notImplemented(); }
-
 String WebCore::signedPublicKeyAndChallengeString(unsigned, const String&, const KURL&) { notImplemented(); return String(); }
 
 String KURL::fileSystemPath() const { notImplemented(); return String(); }
@@ -54,9 +50,3 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi
 namespace WTF {
 void scheduleDispatchFunctionsOnMainThread() { notImplemented(); }
 }
-
-#if USE(JSC)
-#include "EventLoop.h"
-
-void EventLoop::cycle() { notImplemented(); }
-#endif
diff --git a/webkit/port/platform/graphics/ColorSkia.cpp b/webkit/port/platform/graphics/ColorSkia.cpp
index 23c5eb0..d89fbed 100644
--- a/webkit/port/platform/graphics/ColorSkia.cpp
+++ b/webkit/port/platform/graphics/ColorSkia.cpp
@@ -34,4 +34,10 @@ namespace WebCore {
 
 COMPILE_ASSERT(SK_ColorBLACK == Color::black, SkColorAndColorAreLaidOutTheSame);
 
+Color WebCore::focusRingColor()
+{
+    static Color focusRingColor(229, 151, 0, 255);
+    return focusRingColor;
+}
+
 } // namespace WebCore
diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
index 8547756..1dd027a 100644
--- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp
+++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
@@ -24,6 +24,7 @@
 
 #include "Assertions.h"
 #include "AffineTransform.h"
+#include "Color.h"
 #include "FloatRect.h"
 #include "Gradient.h"
 #include "IntRect.h"
@@ -874,7 +875,7 @@ void GraphicsContext::drawFocusRing(const Color& color)
     paint.setAntiAlias(true);
     paint.setStyle(SkPaint::kStroke_Style);
 
-    paint.setARGB(255, 229, 151, 0);
+    paint.setColor(focusRingColor().rgb());
     paint.setStrokeWidth(exterior_offset * 2);
     paint.setPathEffect(new SkCornerPathEffect(exterior_offset * 2))->unref();
     exterior_region.getBoundaryPath(&path);