# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1568974443 -7200
# Node ID 4fda090b016b3fc3405d442abfde7d6e1d9b17fe
# Parent  1c82598d4e68af6dc40438bbd2f1330baab7affd# Parent  d6b83ee3a950c82c0ebe5546a8a20e844b0585a5
Merge

diff -r 1c82598d4e68 -r 4fda090b016b Framework/OpenGL/WebAssemblyOpenGLContext.cpp
--- a/Framework/OpenGL/WebAssemblyOpenGLContext.cpp	Fri Sep 20 12:13:28 2019 +0200
+++ b/Framework/OpenGL/WebAssemblyOpenGLContext.cpp	Fri Sep 20 12:14:03 2019 +0200
@@ -189,7 +189,7 @@
           canvasWidth_ = static_cast<unsigned int>(boost::math::iround(w));
           canvasHeight_ = static_cast<unsigned int>(boost::math::iround(h));
         }
-    
+        
         emscripten_set_canvas_element_size(canvas_.c_str(), canvasWidth_, canvasHeight_);
       }
     };
diff -r 1c82598d4e68 -r 4fda090b016b Framework/Oracle/WebAssemblyOracle.cpp
--- a/Framework/Oracle/WebAssemblyOracle.cpp	Fri Sep 20 12:13:28 2019 +0200
+++ b/Framework/Oracle/WebAssemblyOracle.cpp	Fri Sep 20 12:14:03 2019 +0200
@@ -360,12 +360,12 @@
         memcpy(message, fetch->statusText, kEmscriptenStatusTextSize);
         message[kEmscriptenStatusTextSize] = 0;
 
-        LOG(ERROR) << "Fetching " << fetch->url
+        /*LOG(ERROR) << "Fetching " << fetch->url
                    << " failed, HTTP failure status code: " << fetch->status
                    << " | statusText = " << message
                    << " | numBytes = " << fetch->numBytes
                    << " | totalBytes = " << fetch->totalBytes
-                   << " | readyState = " << fetch->readyState;
+                   << " | readyState = " << fetch->readyState;*/
       }
 
       {
diff -r 1c82598d4e68 -r 4fda090b016b Framework/Viewport/WebAssemblyViewport.cpp
--- a/Framework/Viewport/WebAssemblyViewport.cpp	Fri Sep 20 12:13:28 2019 +0200
+++ b/Framework/Viewport/WebAssemblyViewport.cpp	Fri Sep 20 12:14:03 2019 +0200
@@ -43,9 +43,12 @@
 
   void WebAssemblyOpenGLViewport::UpdateSize()
   {
-    if(compositor_.get() != NULL)
+    context_.UpdateSize();  // First read the size of the canvas
+
+    if (compositor_.get() != NULL)
+    {
       compositor_->Refresh();  // Then refresh the content of the canvas
-    context_.UpdateSize();  // First read the size of the canvas
+    }
   }
 
   /*