Index: third_party/WebKit/public/platform/Platform.h |
diff --git a/third_party/WebKit/public/platform/Platform.h b/third_party/WebKit/public/platform/Platform.h |
index 75eb0319463b12b0bdfe797063fcacc50879e0d5..729f2a66977d14af41ef453cbefe2ab30aea6b6e 100644 |
--- a/third_party/WebKit/public/platform/Platform.h |
+++ b/third_party/WebKit/public/platform/Platform.h |
@@ -31,6 +31,8 @@ |
#ifndef Platform_h |
#define Platform_h |
+#include <memory> |
+ |
#ifdef WIN32 |
#include <windows.h> |
#endif |
@@ -64,6 +66,7 @@ template<class T> class Local; |
namespace blink { |
+class PlatformMojoInterface; |
class ServiceRegistry; |
class WebAudioBus; |
class WebBlobRegistry; |
@@ -526,6 +529,13 @@ public: |
virtual ServiceRegistry* serviceRegistry(); |
+ // Resource hints IPC / Mojo ------------------------------------------ |
+ // TODO(csharrison): Move CrossOriginAttributeValue to public/platform and |
+ // take that as an argument instead of credentialsFlag. |
+ virtual void preconnect(const KURL&, bool credentialsFlag, int numConnections); |
+ virtual void preresolve(const KURL&); |
+ virtual void speculativePreresolve(const KURL&); |
kinuko
2016/06/16 05:39:59
Do we need to expose these here?
Charlie Harrison
2016/06/16 11:00:20
No, I did it here to make mocking easy for unit te
|
+ |
// Platform events ----------------------------------------------------- |
// Device Orientation, Device Motion, Device Light, Battery, Gamepad. |
@@ -604,9 +614,10 @@ public: |
protected: |
Platform(); |
- virtual ~Platform() { } |
+ virtual ~Platform(); |
WebThread* m_mainThread; |
+ std::unique_ptr<PlatformMojoInterface> m_mojoInterface; |
kinuko
2016/06/16 05:39:59
m_mojoInterface's' or m_mojoServices
Charlie Harrison
2016/06/16 11:00:20
m_mojoServices SGTM.
|
}; |
} // namespace blink |