Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update surfman to 0.2 and remove glutin

Browse source
This commit is contained in:
Alan Jeffrey 2020-01-09 17:28:46 -06:00
parent 9dbc6554f0
commit 8bb1732258
94 changed files with 2265 additions and 1513 deletions
Download patch file Download diff file Expand all files Collapse all files

12
support/hololens/ServoApp/ServoControl/ServoControl.h
View file

@ -4,6 +4,8 @@
#include "Servo.h"
#include "DefaultUrl.h"
using namespace winrt::Windows::Foundation::Collections;
namespace winrt::ServoApp::implementation {
struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
@ -108,8 +110,6 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
virtual void OnServoShutdownComplete();
virtual void OnServoTitleChanged(winrt::hstring);
virtual void OnServoURLChanged(winrt::hstring);
virtual void Flush();
virtual void MakeCurrent();
virtual bool OnServoAllowNavigation(winrt::hstring);
virtual void OnServoAnimatingChanged(bool);
virtual void OnServoIMEStateChanged(bool);
@ -150,14 +150,16 @@ private:
std::optional<hstring> secondaryButton,
std::optional<hstring> input);
int mPanelHeight = 0;
int mPanelWidth = 0;
float mDPI = 1;
hstring mInitialURL = DEFAULT_URL;
hstring mCurrentUrl = L"";
bool mTransient = false;
Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();
void CreateRenderSurface();
void DestroyRenderSurface();
void CreateNativeWindow();
EGLNativeWindowType GetNativeWindow();
void RecoverFromLostDevice();
void StartRenderLoop();
@ -204,7 +206,7 @@ private:
void TryLoadUri(hstring);
std::unique_ptr<servo::Servo> mServo;
EGLSurface mRenderSurface{EGL_NO_SURFACE};
PropertySet mNativeWindowProperties;
OpenGLES mOpenGLES;
bool mAnimating = false;
bool mLooping = false;