Diff
Modified: trunk/Source/WebCore/ChangeLog (116496 => 116497)
--- trunk/Source/WebCore/ChangeLog 2012-05-09 06:14:10 UTC (rev 116496)
+++ trunk/Source/WebCore/ChangeLog 2012-05-09 06:16:39 UTC (rev 116497)
@@ -1,3 +1,18 @@
+2012-05-08 Dongwoo Im <[email protected]>
+
+ NavigatorRegisterProtocolHandler can call ChromeClient directly.
+ https://bugs.webkit.org/show_bug.cgi?id=85944
+
+ Reviewed by Adam Barth.
+
+ Covered by fast/dom/register-protocol-handler.html
+
+ * page/Chrome.cpp: Remove registerProtocolHandler function.
+ * page/Chrome.h: Remove registerProtocolHandler prototype.
+ (Chrome):
+ * page/NavigatorRegisterProtocolHandler.cpp: Call ChromeClient::registerProtocolHandler directly.
+ (WebCore::NavigatorRegisterProtocolHandler::registerProtocolHandler):
+
2012-05-08 Mario Sanchez Prada <[email protected]>
Coding style issues present in RenderFrameSet.cpp
Modified: trunk/Source/WebCore/page/Chrome.cpp (116496 => 116497)
--- trunk/Source/WebCore/page/Chrome.cpp 2012-05-09 06:14:10 UTC (rev 116496)
+++ trunk/Source/WebCore/page/Chrome.cpp 2012-05-09 06:16:39 UTC (rev 116497)
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
* Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2012, Samsung Electronics. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -356,13 +357,6 @@
return m_client->shouldInterruptJavaScript();
}
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
-void Chrome::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
-{
- m_client->registerProtocolHandler(scheme, baseURL, url, title);
-}
-#endif
-
IntRect Chrome::windowResizerRect() const
{
return m_client->windowResizerRect();
Modified: trunk/Source/WebCore/page/Chrome.h (116496 => 116497)
--- trunk/Source/WebCore/page/Chrome.h 2012-05-09 06:14:10 UTC (rev 116496)
+++ trunk/Source/WebCore/page/Chrome.h 2012-05-09 06:16:39 UTC (rev 116497)
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2012, Samsung Electronics. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -137,10 +138,6 @@
void setStatusbarText(Frame*, const String&);
bool shouldInterruptJavaScript();
-#if ENABLE(REGISTER_PROTOCOL_HANDLER)
- void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title);
-#endif
-
IntRect windowResizerRect() const;
void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
Modified: trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp (116496 => 116497)
--- trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp 2012-05-09 06:14:10 UTC (rev 116496)
+++ trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp 2012-05-09 06:16:39 UTC (rev 116497)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2011, Google Inc. All rights reserved.
+ * Copyright (C) 2012, Samsung Electronics. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -29,6 +30,7 @@
#if ENABLE(REGISTER_PROTOCOL_HANDLER)
#include "Chrome.h"
+#include "ChromeClient.h"
#include "Document.h"
#include "ExceptionCode.h"
#include "Frame.h"
@@ -137,7 +139,7 @@
if (!page)
return;
- page->chrome()->registerProtocolHandler(scheme, baseURL, url, navigator->frame()->displayStringModifiedByEncoding(title));
+ page->chrome()->client()->registerProtocolHandler(scheme, baseURL, url, navigator->frame()->displayStringModifiedByEncoding(title));
}
} // namespace WebCore
