Code drop from //branches/cupcake/...@124589

1 files changed, 6 insertions, 14 deletions

diff --git a/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp b/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
index 0f9f5a5..3f27462 100644
--- a/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,35 +29,27 @@
 #include "config.h"
 #include "JSHTMLIFrameElement.h"
 
-#include "Document.h"
 #include "CSSHelper.h"
+#include "Document.h"
 #include "HTMLIFrameElement.h"
-#include "PlatformString.h"
-#include "kjs_binding.h"
-#include "kjs_dom.h"
-#ifdef ANDROID_JAVASCRIPT_SECURITY 
-#include "KURL.h"
-#endif
+#include "JSDOMBinding.h"
+
+using namespace JSC;
 
 namespace WebCore {
 
-void JSHTMLIFrameElement::setSrc(KJS::ExecState* exec, KJS::JSValue* value)
+void JSHTMLIFrameElement::setSrc(ExecState* exec, JSValue* value)
 {
     HTMLIFrameElement* imp = static_cast<HTMLIFrameElement*>(impl());
 
     String srcValue = valueToStringWithNullCheck(exec, value);
 
-#ifdef ANDROID_JAVASCRIPT_SECURITY 
     if (protocolIs(parseURL(srcValue), "javascript")) {
-#else
-    if (parseURL(srcValue).startsWith("javascript:", false)) {
-#endif
         if (!checkNodeSecurity(exec, imp->contentDocument()))
             return;
     }
 
     imp->setSrc(srcValue);
-    return;
 }
 
 } // namespace WebCore