apply profile to relevant entities

interface/resources/qml/Browser.qml

@@ -2,6 +2,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.2
 import QtWebChannel 1.0
 import QtWebEngine 1.2
+import FileTypeProfile 1.0
 
 import "controls-uit"
 import "styles" as HifiStyles
@@ -216,6 +217,11 @@ ScrollingWindow {
                 WebChannel.id: "eventBridgeWrapper"
                 property var eventBridge;
             }
+            
+            profile: FileTypeProfile {
+                id: webviewProfile
+                storageName: "qmlWebEngine"
+            }
 
             webChannel.registeredObjects: [eventBridgeWrapper]
 

interface/resources/qml/controls/WebEntityView.qml

@@ -0,0 +1,20 @@
+//
+//  WebEntityView.qml
+//
+//  Created by Kunal Gosar on 16 March 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import "."
+import FileTypeProfile 1.0
+
+WebView {
+    viewProfile: FileTypeProfile {
+        id: webviewProfile
+        storageName: "qmlWebEngine"
+    }
+}

interface/resources/qml/controls/WebView.qml

@@ -2,7 +2,7 @@ import QtQuick 2.5
 import QtWebEngine 1.1
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
-import FileTypeProfile 1.0
+import HFWebEngineProfile 1.0
 
 Item {
     property alias url: root.url
@@ -27,6 +27,8 @@ Item {
         WebChannel.id: "eventBridgeWrapper"
         property var eventBridge;
     }
+    
+    property alias viewProfile: root.profile
 
     WebEngineView {
         id: root
@@ -36,7 +38,7 @@ Item {
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: FileTypeProfile {
+        profile: HFWebEngineProfile {
             id: webviewProfile
             storageName: "qmlWebEngine"
         }

interface/resources/qml/hifi/Desktop.qml

@@ -2,7 +2,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtWebEngine 1.1;
 import Qt.labs.settings 1.0
-import FileTypeProfile 1.0
+import HFWebEngineProfile 1.0
 
 import "../desktop" as OriginalDesktop
 import ".."
@@ -27,7 +27,7 @@ OriginalDesktop.Desktop {
     property alias toolWindow: toolWindow
     ToolWindow { id: toolWindow }
 
-    property var browserProfile: FileTypeProfile {
+    property var browserProfile: HFWebEngineProfile {
         id: webviewProfile
         storageName: "qmlWebEngine"
     }

interface/src/networking/FileTypeProfile.cpp

@@ -23,4 +23,4 @@ FileTypeProfile::FileTypeProfile(QObject* parent) :
 
     auto requestInterceptor = new FileTypeRequestInterceptor(this);
     setRequestInterceptor(requestInterceptor);
-}
+}

interface/src/networking/FileTypeProfile.h

@@ -22,4 +22,4 @@ public:
 };
 
 
-#endif // hifi_FileTypeProfile_h
+#endif // hifi_FileTypeProfile_h

interface/src/networking/FileTypeRequestInterceptor.h

@@ -23,4 +23,4 @@ public:
     virtual void interceptRequest(QWebEngineUrlRequestInfo& info) override;
 };
 
-#endif // hifi_FileTypeRequestInterceptor_h
+#endif // hifi_FileTypeRequestInterceptor_h

interface/src/networking/RequestFilters.cpp

@@ -49,13 +49,9 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
 
 void RequestFilters::interceptFileType(QWebEngineUrlRequestInfo& info) {
     QString filename = info.requestUrl().fileName();
-    
     if (isJavaScriptFile(filename) || isEntityFile(filename)) {
         static const QString CONTENT_HEADER = "Accept";
-        static const QString TYPE_VALUE = "text/html";
+        static const QString TYPE_VALUE = "text/plain";
         info.setHttpHeader(CONTENT_HEADER.toLocal8Bit(), TYPE_VALUE.toLocal8Bit());
-        static const QString CONTENT_DISPOSITION = "Content-Disposition";
-        static const QString DISPOSITION_VALUE = "inline";
-        info.setHttpHeader(CONTENT_DISPOSITION.toLocal8Bit(), DISPOSITION_VALUE.toLocal8Bit());
     }
-}
+}

interface/src/networking/RequestFilters.h

@@ -25,4 +25,4 @@ public:
     void interceptFileType(QWebEngineUrlRequestInfo& info);
 };
 
-#endif // hifi_RequestFilters_h
+#endif // hifi_RequestFilters_h

libraries/entities-renderer/src/RenderableWebEntityItem.cpp

@@ -266,7 +266,7 @@ void RenderableWebEntityItem::loadSourceURL() {
             _webSurface->setMaxFps(DEFAULT_MAX_FPS);
         }
 
-        _webSurface->load("WebView.qml", [&](QQmlContext* context, QObject* obj) {
+        _webSurface->load("WebEntityView.qml", [&](QQmlContext* context, QObject* obj) {
             context->setContextProperty("eventBridgeJavaScriptToInject", QVariant(_javaScriptToInject));
         });