--- out/Debug/gen/blink/bindings/V8Window.cpp.bak       2013-10-15 16:49:54.288883309 -0400
+++ out/Debug/gen/blink/bindings/V8Window.cpp   2013-10-15 17:19:37.160931053 -0400
@@ -815,6 +815,16 @@
     TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
 }

+static void locationAttributeSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
+{
+    DOMWindow* proxyImp = V8Window::toNative(info.Holder());
+    Location* imp = proxyImp->location();
+    if (!imp)
+        return;
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
+    imp->setHref(activeDOMWindow(), firstDOMWindow(), v);
+}
+
 static void locationAttributeSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
 {
     TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
@@ -823,14 +833,24 @@
         v8::Handle<v8::Value> loggerArg[] = { value };
         contextData->activityLogger()->log("Window.location", 1, &loggerArg[0], "Setter");
     }
-    V8Window::locationAttributeSetterCustom(name, value, info);
+    DOMWindowV8Internal::locationAttributeSetter(name, value, info);
     TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
 }

+static void locationAttributeSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
+{
+    DOMWindow* proxyImp = V8Window::toNative(info.Holder());
+    Location* imp = proxyImp->location();
+    if (!imp)
+        return;
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, v, value);
+    imp->setHref(activeDOMWindow(), firstDOMWindow(), v);
+}
+
 static void locationAttributeSetterCallbackForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
 {
     TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter");
-    V8Window::locationAttributeSetterCustom(name, value, info);
+    DOMWindowV8Internal::locationAttributeSetterForMainWorld(name, value, info);
     TRACE_EVENT_SET_SAMPLING_STATE("V8", "Execution");
 }