Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 10 insertions, 2 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp b/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
index a5183b135..2334856ef 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
@@ -34,8 +34,12 @@ using namespace WebCore;
 
 namespace WebKit {
 
-bool InjectedBundle::load(APIObject* initializationUserData)
+bool InjectedBundle::initialize(const WebProcessCreationParameters&, API::Object* initializationUserData)
 {
+    // Built-in bundle
+    if (m_path.isEmpty())
+        return true;
+
     m_platformBundle.setFileName(static_cast<QString>(m_path));
     if (!m_platformBundle.load()) {
         qWarning("Error loading the injected bundle: %s", qPrintable(m_platformBundle.errorString()));
@@ -54,7 +58,11 @@ bool InjectedBundle::load(APIObject* initializationUserData)
     return true;
 }
 
-void InjectedBundle::activateMacFontAscentHack()
+void InjectedBundle::setBundleParameter(const WTF::String&, const IPC::DataReference&)
+{
+}
+
+void InjectedBundle::setBundleParameters(const IPC::DataReference&)
 {
 }