Readded SVG/CSS3 animations/compositing/gl-contexts, increased performance with llvm lto options, beginnings of the js api. Fixed deprecated GL functions in Cairo code, this.. this scares me that WebKit uses deprecated cairo/gl code. Consider moving to skia as its quite smaller foot print and doesnt require switching RGBA ARGB, etc.

Author: trevorlinton

common.gypi

@@ -8,11 +8,16 @@
 		'emscripten_ld':'<!(echo $EMSCRIPTEN_ROOT)/emcc',
 		# see configuration Release and Debug below for specific optimizations
 		# by release types.
-		'emscripten_linktojs':'-s EXPORTED_FUNCTIONS="[\'_createWebKit\',\'_setHtml\',\'_setTransparent\',\'_scrollBy\',\'_resize\']" --embed-files ../src/assets/fontconfig/fonts@/usr/share/fonts --embed-files ../src/assets/fontconfig/config/fonts.conf@/etc/fonts/fonts.conf --embed-files ../src/assets/fontconfig/cache@/usr/local/var/cache/fontconfig -s TOTAL_MEMORY=50331648 -s LINKABLE=1 -s FULL_ES2=1 -s ASM_JS=0 --post-js ../src/webkit.api.js', # --memory-init-file 1 -s OUTLINING_LIMIT=5000 -s 
+		'emscripten_linktojs':'-s EXPORTED_FUNCTIONS="[\'_createWebKit\',\'_setHtml\',\'_setTransparent\',\'_scrollBy\',\'_resize\']" --embed-files ../src/assets/fontconfig/fonts@/usr/share/fonts --embed-files ../src/assets/fontconfig/config/fonts.conf@/etc/fonts/fonts.conf --embed-files ../src/assets/fontconfig/cache@/usr/local/var/cache/fontconfig -s TOTAL_MEMORY=50331648 -s FULL_ES2=1 -s ASM_JS=0 --post-js ../src/webkit.api.js -o webkit.js',
+		# --memory-init-file 1, for some reason this causes a llvm trap on emscripten 1.13.0
+		# -s NO_EXIT_RUNTIME=1, for some reason this causes a llvm trap on emscripten 1.13.0
+		# -s OUTLINING_LIMIT=5000, outlining never worked, i'm unsure why, emscripten 1.13.0
+		# -s LINKABLE=1, adding this removes the warning:unresolved symbols to odd emscripten_gl<func> but
 		'cflags':'-Wno-warn-absolute-paths -fshort-wchar -isysroot <(emscripten_sysroot)',
 		'cflags_cc':'-std=c++0x',
 		'ldflags':'',
-		'webcore_excludes':'(SSLHandle\\.cpp$|leveldb/|skia|glx/|cg/|ca/|avfoundation/|wince/|Modules/|soup/|ios/|nix/|plugin/|plugins/|blackberry/|WinCE|Gtk|storage/|win/|linux/|glib/|cocoa/|gtk/|cf/|mac/|efl/|appcache/|ExportFileGenerator\\.cpp$|CF\\.cpp$|IOS\\.|Mac\\.|Win\\.|XMLHttpRequest|ThemeSafari|PlugInElement|PlugInImageElement|JSAbstractView|InspectorWebBackend|AllInOne|OpenTypeUtilities|HarfBuzzFaceCoreText|graphics/FontPlatformData\\.cpp$|GraphicsContext3DOpenGL\\.cpp$|platform/sql/|ICU\\.cpp$|enchant/|ExportFileGenerator\\.cpp$|SmartReplaceICU\\.cpp$|HTMLObjectElement\\.cpp$|RenderEmbeddedObject\\.cpp$|Extensions3DOpenGL\\.cpp$|DragController\\.cpp$|JSDOMPlugin\\.cpp$|WebCoreDerived/JS|posix/|debug.cpp$|ANGLE/src/common/|_win.cpp$|BlobResourceHandle\\.cpp$|BlobRegistryImpl\\.cpp$|BlobRegistry\\.cpp$|GraphicsContext3DOpenGL\\.cpp$|svg/)', #InitializeParseContext|ossource_posix.cpp$|coordinated/
+		'webcore_excludes':'(SSLHandle\\.cpp$|leveldb/|skia|glx/|cg/|ca/|avfoundation/|wince/|Modules/|soup/|ios/|nix/|plugin/|plugins/|blackberry/|WinCE|Gtk|storage/|win/|linux/|glib/|cocoa/|gtk/|cf/|mac/|efl/|appcache/|ExportFileGenerator\\.cpp$|CF\\.cpp$|IOS\\.|Mac\\.|Win\\.|XMLHttpRequest|ThemeSafari|PlugInElement|PlugInImageElement|JSAbstractView|InspectorWebBackend|AllInOne|OpenTypeUtilities|HarfBuzzFaceCoreText|graphics/FontPlatformData\\.cpp$|GraphicsContext3DOpenGL\\.cpp$|platform/sql/|ICU\\.cpp$|enchant/|ExportFileGenerator\\.cpp$|SmartReplaceICU\\.cpp$|HTMLObjectElement\\.cpp$|RenderEmbeddedObject\\.cpp$|Extensions3DOpenGL\\.cpp$|DragController\\.cpp$|JSDOMPlugin\\.cpp$|WebCoreDerived/JS|posix/|debug.cpp$|ANGLE/src/common/|_win.cpp$|BlobResourceHandle\\.cpp$|BlobRegistryImpl\\.cpp$|BlobRegistry\\.cpp$|GraphicsContext3DOpenGL\\.cpp$)',
+		#svg/InitializeParseContext|ossource_posix.cpp$|coordinated/
 	},
 	'target_defaults': {
 		'default_configuration': 'Release',
@@ -40,7 +45,7 @@
 				# for some bizzare reason adding -g0 onto this causes the compiler to slow to a crawl and
 				#		take up gigabytes (13+) of memory. Don't do it.
 				# Using ASM_JS=0 is necessary at the moment since browsers limit the amount of local vars.
-				'jsflags+':['<(emscripten_linktojs) -O3 --llvm-opts 3'], # --proxy-to-worker
+				'jsflags+':['<(emscripten_linktojs) -O3 --llvm-opts 3 --llvm-lto 3'], # -s INLINING_LIMIT=1    --proxy-to-worker
 			},
 			'Debug': {
 				'defines+': ['DEBUG','TARGET_EMSCRIPTEN'],

deps/WebKit/Source/WebCore/DerivedSources.make

@@ -25,7 +25,7 @@
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-include ../../build/features.make
+include ../../tools/features.make
 
 VPATH = \
     $(WebCore) \

deps/WebKit/Source/WebCore/page/FrameView.cpp

@@ -870,7 +870,7 @@ void FrameView::updateCompositingLayersAfterLayout()
     RenderView* renderView = this->renderView();
     if (!renderView)
         return;
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 		fprintf(stderr, "WebKit: FrameView::updateCompositingLayersAfterLayout() firing updateCompositingLayers.\n");
 #endif
     // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
@@ -2509,7 +2509,7 @@ const unsigned cRepaintRectUnionThreshold = 25;
 
 void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
 {
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 	webkitTrace();
 	fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: rect: x: %i y: %i h: %i w: %i immediate: %i\n", r.x(), r.y(), r.height(), r.width(), immediate);
 #endif
@@ -2537,33 +2537,33 @@ void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
         else
             m_repaintRects[0].unite(paintRect);
         m_repaintCount++;
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: issuing repaint in: %f m_deferingRepaints is: %i\n", delay, m_deferringRepaints);
 #endif
 				if (!m_deferringRepaints) {
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 						fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: issuing deferred paint in: %f\n", delay);
 #endif
             startDeferredRepaintTimer(delay);
 				}
 
         return;
     } else {
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 			fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: m_deferringRepaints=true || m_deferredRepaintTimer.isActive()=true || delay > 0\n");
 #endif
 		}
 
 		if (!shouldUpdate(immediate)) {
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: shouldUpdate(immediate) returned false.\n");
 #endif
         return;
 		}
 #if USE(TILED_BACKING_STORE)
     if (frame().tiledBackingStore()) {
         frame().tiledBackingStore()->invalidate(r);
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: FrameView::repaintContentRectangle: Using a tiled backing store, leaving.\n");
 #endif
         return;
@@ -2755,21 +2755,21 @@ void FrameView::doDeferredRepaints()
     if (!shouldUpdate()) {
         m_repaintRects.clear();
         m_repaintCount = 0;
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: doDeferredRepaints: shouldUpdate was false, exiting\n");
 #endif
         return;
     }
     unsigned size = m_repaintRects.size();
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 		fprintf(stderr, "WebKit: doDeferredRepaints: amount of repaint rects: %i\n",size);
 #endif
     for (unsigned i = 0; i < size; i++) {
 #if USE(TILED_BACKING_STORE)
         if (frame().tiledBackingStore()) {
-#if PLATFORM(JS)
+#if PLATFORM(JS) && defined(DEBUG)
 						fprintf(stderr, "WebKit: doDeferredRepaints: invalidating tiledBackingStore\n");
-//						fprintf(stderr, "WebKit: repaintRect size (x,y,w,h): %i %i %i %i\n", m_repaintRects[i].x(),m_repaintRects[i].y(),m_repaintRects[i].width(),m_repaintRects[i].height());
+						fprintf(stderr, "WebKit: repaintRect size (x,y,w,h): %i %i %i %i\n", m_repaintRects[i].x(),m_repaintRects[i].y(),m_repaintRects[i].width(),m_repaintRects[i].height());
 #endif
 						frame().tiledBackingStore()->invalidate(pixelSnappedIntRect(m_repaintRects[i]));
             continue;
@@ -2791,23 +2791,33 @@ bool FrameView::shouldUseLoadTimeDeferredRepaintDelay() const
 
     // Don't defer after the initial load of the page has been completed.
 		if (frame().tree().top().loader().isComplete()) {
-				fprintf(stderr, "WebKit: Document has finished loading, do not use deferred repaint.\n");
-        return false;
+#if PLATFORM(JS) && defined(DEBUG)
+			fprintf(stderr, "WebKit: Document has finished loading, do not use deferred repaint.\n");
+#endif
+				return false;
 		}
     Document* document = frame().document();
 		if (!document) {
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: Document does not exist, do not use deferred repaint.\n");
+#endif
         return false;
 		}
 		if (document->parsing()) {
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: Document is parsing, use deferred repaint.\n");
+#endif
         return true;
 		}
 		if (document->cachedResourceLoader()->requestCount()) {
+#if PLATFORM(JS) && defined(DEBUG)
 				fprintf(stderr, "WebKit: Request Cache Count is > 0, use deferred repaint.\n");
+#endif
         return true;
 		}
+#if PLATFORM(JS) && defined(DEBUG)
 		fprintf(stderr, "WebKit: default: use deferred repaint.\n");
+#endif
 		return false;
 }
 

deps/WebKit/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -76,21 +76,21 @@ PassRefPtr<cairo_surface_t> createCairoGLSurface(const IntSize& size, uint32_t&
     // from a pre-existing surface.
     glGenTextures(1, &texture);
     glBindTexture(GL_TEXTURE_2D, texture);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-    glTexImage2D(GL_TEXTURE_2D, 0 /* level */, GL_RGBA8, size.width(), size.height(), 0 /* border */, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+    glTexImage2D(GL_TEXTURE_2D, 0 /* level */, GL_UNSIGNED_BYTE/* GL_RGBA8 */, size.width(), size.height(), 0 /* border */, GL_RGBA, GL_UNSIGNED_BYTE, 0);
 
     GLContext* context = GLContext::sharingContext();
     cairo_device_t* device = context->cairoDevice();
-
+#if !PLATFORM(JS)
     // Thread-awareness is a huge performance hit on non-Intel drivers.
-    cairo_gl_device_set_thread_aware(device, FALSE);
-
+    cairo_gl_device_set_thread_aware(device, false);
+#endif
     return adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, texture, size.width(), size.height()));
 }
 #endif

features.gypi

@@ -12,31 +12,31 @@
       'ENABLE_ORIENTATION_EVENTS=0',
       'ENABLE_PRINTING=0',
       'ENABLE_NAVIGATOR_CONTENT_UTILS=0',
-      'ENABLE_3D_RENDERING=0',
-      'ENABLE_ACCELERATED_2D_CANVAS=0',
-      'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0',
+      'ENABLE_3D_RENDERING=1',
+      'ENABLE_ACCELERATED_2D_CANVAS=1',
+      'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=1',
       'ENABLE_BLOB=0',
       'ENABLE_CACHE_PARTITIONING=0',
       'ENABLE_CANVAS_PATH=1',
       'ENABLE_CANVAS_PROXY=0',
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_CSP_NEXT=0',
       'ENABLE_CSS_BOX_DECORATION_BREAK=1',
-      'ENABLE_CSS_COMPOSITING=0',
+      'ENABLE_CSS_COMPOSITING=1',
       'ENABLE_CSS_DEVICE_ADAPTATION=0',
-      'ENABLE_CSS_EXCLUSIONS=0',
+      'ENABLE_CSS_EXCLUSIONS=1',
       'ENABLE_CSS_FILTERS=1',
       'ENABLE_CSS_IMAGE_ORIENTATION=0',
-      'ENABLE_CSS_IMAGE_RESOLUTION=0',
+      'ENABLE_CSS_IMAGE_RESOLUTION=1',
       'ENABLE_CSS_REGIONS=1',
       'ENABLE_CSS_SHADERS=1',
       'ENABLE_CSS_SHAPES=1',
       'ENABLE_CSS_STICKY_POSITION=1',
       'ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1',
-      'ENABLE_CSS3_CONDITIONAL_RULES=0',
-      'ENABLE_CSS3_TEXT=0',
+      'ENABLE_CSS3_CONDITIONAL_RULES=0', # Note, upstream code is not finished, does not compile.
+      'ENABLE_CSS3_TEXT=1',
       'ENABLE_CSS3_TEXT_DECORATION=1',
-      'ENABLE_CSS3_TEXT_LINE_BREAK=0',
+      'ENABLE_CSS3_TEXT_LINE_BREAK=1',
       'ENABLE_CURSOR_VISIBILITY=1',
       'ENABLE_CUSTOM_SCHEME_HANDLER=0',
       'ENABLE_DASHBOARD_SUPPORT=0',
@@ -103,10 +103,10 @@
       'ENABLE_SHARED_WORKERS=0',
       'ENABLE_SPEECH_SYNTHESIS=0',
       'ENABLE_SQL_DATABASE=0',
-      'ENABLE_SUBPIXEL_LAYOUT=0',
+      'ENABLE_SUBPIXEL_LAYOUT=1',
       'ENABLE_SUBTLE_CRYPTO=0',
-      'ENABLE_SVG=0', #temporary
-      'ENABLE_SVG_FONTS=0',#temporary
+      'ENABLE_SVG=1', #temporary
+      'ENABLE_SVG_FONTS=1',#temporary
       'ENABLE_TEMPLATE_ELEMENT=1',
       'ENABLE_TEXT_AUTOSIZING=0',
       'ENABLE_THREADED_HTML_PARSER=0',
@@ -117,7 +117,7 @@
       'ENABLE_VIDEO_TRACK=0',
       'ENABLE_VIEW_MODE_CSS_MEDIA=0',
       'ENABLE_WEBGL=1',
-      'ENABLE_WEB_ANIMATIONS=0',
+      'ENABLE_WEB_ANIMATIONS=1',
       'ENABLE_WEB_AUDIO=0',
       'ENABLE_WEB_SOCKETS=0',
       'ENABLE_WEB_TIMING=0',