Skip to content
Permalink
Browse files

Branding: s/servo/firefox reality/

  • Loading branch information...
paulrouget committed Sep 3, 2019
1 parent 4f4e219 commit 56dd81f8523075f329043265f45187a6cfad9104
Showing with 110 additions and 19 deletions.
  1. +2 −0 .gitignore
  2. BIN support/hololens/ServoApp/Assets/LargeTile.scale-100.png
  3. BIN support/hololens/ServoApp/Assets/LargeTile.scale-200.png
  4. BIN support/hololens/ServoApp/Assets/LargeTile.scale-400.png
  5. BIN support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png
  6. BIN support/hololens/ServoApp/Assets/SmallTile.scale-100.png
  7. BIN support/hololens/ServoApp/Assets/SmallTile.scale-200.png
  8. BIN support/hololens/ServoApp/Assets/SmallTile.scale-400.png
  9. BIN support/hololens/ServoApp/Assets/SplashScreen.scale-100.png
  10. BIN support/hololens/ServoApp/Assets/SplashScreen.scale-200.png
  11. BIN support/hololens/ServoApp/Assets/SplashScreen.scale-400.png
  12. BIN support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png
  13. BIN support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png
  14. BIN support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png
  15. BIN support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
  16. BIN support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
  17. BIN support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
  18. BIN support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png
  19. BIN support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png
  20. BIN support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png
  21. BIN support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png
  22. BIN support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png
  23. BIN support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png
  24. BIN support/hololens/ServoApp/Assets/StoreLogo.png
  25. BIN support/hololens/ServoApp/Assets/StoreLogo.scale-100.png
  26. BIN support/hololens/ServoApp/Assets/StoreLogo.scale-200.png
  27. BIN support/hololens/ServoApp/Assets/StoreLogo.scale-400.png
  28. BIN support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png
  29. BIN support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png
  30. BIN support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png
  31. +2 −2 support/hololens/ServoApp/BrowserPage.h
  32. +12 −7 support/hololens/ServoApp/Package.appxmanifest
  33. +25 −4 support/hololens/ServoApp/ServoApp.vcxproj
  34. +68 −5 support/hololens/ServoApp/ServoApp.vcxproj.filters
  35. BIN support/hololens/ServoApp/ServoApp_TemporaryKey.pfx
  36. +1 −1 support/hololens/ServoApp/ServoControl/ServoControl.h
@@ -53,6 +53,8 @@ support/hololens/ServoApp/x64/
support/hololens/ServoApp/ARM/
support/hololens/ServoApp/ARM64/
support/hololens/ServoApp/Generated\ Files
support/hololens/ServoApp/BundleArtifacts/
support/hololens/ServoApp/support/

# Ignore thumbnails created by Windows
support/hololens/ServoApp/Thumbs.db
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -9,8 +9,8 @@

namespace winrt::ServoApp::implementation {

static const hstring SERVO_SCHEME = L"servo";
static const hstring SERVO_SCHEME_SLASH_SLASH = L"servo://";
static const hstring SERVO_SCHEME = L"fxr";
static const hstring SERVO_SCHEME_SLASH_SLASH = L"fxr://";

struct BrowserPage : BrowserPageT<BrowserPage> {
public:
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="1d265729-8836-4bd3-9992-4cb111d1068b" Publisher="CN=paul" Version="1.0.0.0" />
<Identity Name="1d265729-8836-4bd3-9992-4cb111d1068b" Publisher="CN=Allizom" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="1d265729-8836-4bd3-9992-4cb111d1068b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>ServoApp</DisplayName>
<DisplayName>Firefox Reality</DisplayName>
<PublisherDisplayName>Mozilla</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
@@ -15,16 +15,21 @@
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ServoApp.App">
<uap:VisualElements DisplayName="ServoApp" Description="A Servo-based browser." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
<uap:VisualElements DisplayName="Firefox Reality" Description="Firefox Reality brings the best and freshest content from the web that you know and love to Virtual Reality headsets. Our browser provides an open, accessible and secure way for everyone to explore the web. Experience sharp text, high quality videos, and a seamless transition from 2D to 3D immersive modes. Enjoy the best possible web browsing experience with Firefox Reality." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" ShortName="Firefox Reality" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo" />
<uap:ShowOn Tile="wide310x150Logo" />
<uap:ShowOn Tile="square310x310Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
<Extensions>
<uap:Extension Category="windows.protocol">
<uap:Protocol Name="servo">
<uap:Protocol Name="fxr">
<uap:Logo>Assets\StoreLogo.png</uap:Logo>
<uap:DisplayName>Servo URL</uap:DisplayName>
<uap:DisplayName>Firefox Reality URL</uap:DisplayName>
</uap:Protocol>
</uap:Extension>
</Extensions>
@@ -33,4 +38,4 @@
<Capabilities>
<Capability Name="internetClient" />
</Capabilities>
</Package>
</Package>
@@ -78,7 +78,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<PackageCertificateKeyFile>ServoApp_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>8263338D5334DAD5918004E354DDCDCF8A2C2217</PackageCertificateThumbprint>
<PackageCertificateThumbprint>DC99ACEDA24EBA00BFB07A3986BB6892B0DE278B</PackageCertificateThumbprint>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
@@ -937,13 +937,34 @@
<None Include="ServoApp_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Image Include="Assets\LockScreenLogo.scale-200.png" />
<Image Include="Assets\LargeTile.scale-100.png" />
<Image Include="Assets\LargeTile.scale-200.png" />
<Image Include="Assets\LargeTile.scale-400.png" />
<Image Include="Assets\SmallTile.scale-100.png" />
<Image Include="Assets\SmallTile.scale-200.png" />
<Image Include="Assets\SmallTile.scale-400.png" />
<Image Include="Assets\SplashScreen.scale-100.png" />
<Image Include="Assets\SplashScreen.scale-200.png" />
<Image Include="Assets\SplashScreen.scale-400.png" />
<Image Include="Assets\Square150x150Logo.scale-100.png" />
<Image Include="Assets\Square150x150Logo.scale-200.png" />
<Image Include="Assets\Square150x150Logo.scale-400.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
<Image Include="Assets\Square44x44Logo.scale-100.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-400.png" />
<Image Include="Assets\Square44x44Logo.targetsize-16.png" />
<Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Image Include="Assets\StoreLogo.png" />
<Image Include="Assets\Square44x44Logo.targetsize-256.png" />
<Image Include="Assets\Square44x44Logo.targetsize-48.png" />
<Image Include="Assets\StoreLogo.scale-100.png" />
<Image Include="Assets\StoreLogo.scale-200.png" />
<Image Include="Assets\StoreLogo.scale-400.png" />
<Image Include="Assets\Wide310x150Logo.scale-100.png" />
<Image Include="Assets\Wide310x150Logo.scale-200.png" />
<Image Include="Assets\Wide310x150Logo.scale-400.png" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp">
@@ -987,4 +1008,4 @@
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" />
</Target>
</Project>
</Project>
@@ -42,9 +42,6 @@
<Image Include="Assets\Wide310x150Logo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-200.png">
<Filter>Assets</Filter>
</Image>
@@ -57,7 +54,73 @@
<Image Include="Assets\SplashScreen.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LockScreenLogo.scale-200.png">
<Image Include="Assets\SmallTile.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SmallTile.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SmallTile.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-16.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-48.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-256.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SplashScreen.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SplashScreen.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-400.png">
<Filter>Assets</Filter>
</Image>
</ItemGroup>
@@ -838,4 +901,4 @@
<ItemGroup>
<ApplicationDefinition Include="App.xaml" />
</ItemGroup>
</Project>
</Project>
Binary file not shown.
@@ -95,7 +95,7 @@ struct ServoControl : ServoControlT<ServoControl>, public servo::ServoDelegate {
winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent;

float mDPI = 1;
hstring mInitialURL = L"https://servo.org";
hstring mInitialURL = L"about:blank";
bool mTransient = false;

Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();

0 comments on commit 56dd81f

Please sign in to comment.
You can’t perform that action at this time.