Bug#776286: unblock: webkitgtk/2.4.8-1

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#776286: unblock: webkitgtk/2.4.8-1
From: Alberto Garcia <berto@igalia.com>
Date: Mon, 26 Jan 2015 11:44:05 +0200
Message-id: <[🔎] 20150126094405.8135.30458.reportbug@perseus.local>
Reply-to: Alberto Garcia <berto@igalia.com>, 776286@bugs.debian.org

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package webkitgtk

WebKitGTK+ 2.4.8 is a bugfix release that solves several security
issues (8 CVEs), build failures, a crash and SSL connection problems.

   http://webkitgtk.org/2015/01/07/webkitgtk2.4.8-released.html

Note that some of these fixes had already been backported to the
previous Debian packages (see #769136 and #772559).

unblock webkitgtk/2.4.8-1

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru webkitgtk-2.4.7/aclocal.m4 webkitgtk-2.4.8/aclocal.m4
--- webkitgtk-2.4.7/aclocal.m4	2014-10-22 13:38:15.000000000 +0300
+++ webkitgtk-2.4.8/aclocal.m4	2015-01-07 11:47:49.000000000 +0200
@@ -619,10 +619,9 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
diff -Nru webkitgtk-2.4.7/ChangeLog webkitgtk-2.4.8/ChangeLog
--- webkitgtk-2.4.7/ChangeLog	2014-10-22 11:23:08.000000000 +0300
+++ webkitgtk-2.4.8/ChangeLog	2015-01-07 11:45:40.000000000 +0200
@@ -1,3 +1,9 @@
+2014-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update NEWS and Versions.m4 for 2.4.7 release.
+
+        * Source/autotools/Versions.m4: Bump version numbers.
+
 2014-10-22  Michael Weber  <xmw@gentoo.org>
 
         [GTK][Stable] webkitgtk-2.4.6: fails to build with --disable-video
diff -Nru webkitgtk-2.4.7/configure webkitgtk-2.4.8/configure
--- webkitgtk-2.4.7/configure	2014-10-22 13:38:17.000000000 +0300
+++ webkitgtk-2.4.8/configure	2015-01-07 11:47:51.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for WebKitGTK 2.4.7.
+# Generated by GNU Autoconf 2.69 for WebKitGTK 2.4.8.
 #
 # Report bugs to <http://bugs.webkit.org/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='WebKitGTK'
 PACKAGE_TARNAME='webkitgtk'
-PACKAGE_VERSION='2.4.7'
-PACKAGE_STRING='WebKitGTK 2.4.7'
+PACKAGE_VERSION='2.4.8'
+PACKAGE_STRING='WebKitGTK 2.4.8'
 PACKAGE_BUGREPORT='http://bugs.webkit.org/'
 PACKAGE_URL=''
 
@@ -1642,7 +1642,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures WebKitGTK 2.4.7 to adapt to many kinds of systems.
+\`configure' configures WebKitGTK 2.4.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1712,7 +1712,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of WebKitGTK 2.4.7:";;
+     short | recursive ) echo "Configuration of WebKitGTK 2.4.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1992,7 +1992,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-WebKitGTK configure 2.4.7
+WebKitGTK configure 2.4.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2536,7 +2536,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by WebKitGTK $as_me 2.4.7, which was
+It was created by WebKitGTK $as_me 2.4.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2922,7 +2922,7 @@
 
 WEBKIT_MAJOR_VERSION=2
 WEBKIT_MINOR_VERSION=4
-WEBKIT_MICRO_VERSION=7
+WEBKIT_MICRO_VERSION=8
 WEBKIT_USER_AGENT_MAJOR_VERSION=538
 WEBKIT_USER_AGENT_MINOR_VERSION=15
 
@@ -4265,8 +4265,8 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5486,9 +5486,9 @@
 fi
 
 
-LIBWEBKITGTK_VERSION=22:13:22
-LIBJAVASCRIPTCOREGTK_VERSION=16:15:16
-LIBWEBKIT2GTK_VERSION=35:10:10
+LIBWEBKITGTK_VERSION=22:14:22
+LIBJAVASCRIPTCOREGTK_VERSION=16:16:16
+LIBWEBKIT2GTK_VERSION=35:11:10
 
 
 
@@ -22693,7 +22693,7 @@
 
 # Define the identity of the package.
  PACKAGE='webkitgtk'
- VERSION='2.4.7'
+ VERSION='2.4.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24376,7 +24376,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by WebKitGTK $as_me 2.4.7, which was
+This file was extended by WebKitGTK $as_me 2.4.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24442,7 +24442,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-WebKitGTK config.status 2.4.7
+WebKitGTK config.status 2.4.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru webkitgtk-2.4.7/debian/changelog webkitgtk-2.4.8/debian/changelog
--- webkitgtk-2.4.7/debian/changelog	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/changelog	2015-01-17 14:19:53.000000000 +0200
@@ -1,3 +1,23 @@
+webkitgtk (2.4.8-1) unstable; urgency=medium
+
+  * New upstream release, which includes some of the patches already
+    available in Debian plus security fixes for CVE-2014-1344,
+    CVE-2014-1384, CVE-2014-1385, CVE-2014-1386, CVE-2014-1387,
+    CVE-2014-1388, CVE-2014-1389 and CVE-2014-1390.
+  * debian/patches/dfg-jit.patch,
+    debian/patches/enable_llint.patch,
+    debian/patches/flash-crash.patch,
+    debian/patches/local-label-string-hurd.patch,
+    debian/patches/no-ssl-record-version.patch,
+    debian/patches/nullptr-applystylecommand.patch,
+    debian/patches/protect-document.patch,
+    debian/patches/touch-event.patch:
+     + Remove.
+  * debian/patches/fix-ftbfs-pluginpackage.patch:
+    + Fix FTBFS.
+
+ -- Alberto Garcia <berto@igalia.com>  Sat, 17 Jan 2015 14:19:43 +0200
+
 webkitgtk (2.4.7-3) unstable; urgency=medium
 
   * debian/patches/ppc64-align.patch:
diff -Nru webkitgtk-2.4.7/debian/patches/dfg-jit.patch webkitgtk-2.4.8/debian/patches/dfg-jit.patch
--- webkitgtk-2.4.7/debian/patches/dfg-jit.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/dfg-jit.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,16 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Enable DFG JIT on FreeBSD and Hurd
-Bug: https://bugs.webkit.org/show_bug.cgi?id=128898
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -731,7 +731,7 @@
- 
- #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
- /* Enable the DFG JIT on X86 and X86_64.  Only tested on Mac, GNU/Linux and FreeBSD. */
--#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD))
-+#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD))
- #define ENABLE_DFG_JIT 1
- #endif
- /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */
diff -Nru webkitgtk-2.4.7/debian/patches/enable_llint.patch webkitgtk-2.4.8/debian/patches/enable_llint.patch
--- webkitgtk-2.4.7/debian/patches/enable_llint.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/enable_llint.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,16 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Enable LLINT in FreeBSD and Hurd
-Bug: https://bugs.webkit.org/show_bug.cgi?id=126502
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -741,7 +741,7 @@
-    low-level interpreter. */
- #if !defined(ENABLE_LLINT) \
-     && ENABLE(JIT) \
--    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
-+    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD)) \
-     && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
-     && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
- #define ENABLE_LLINT 1
diff -Nru webkitgtk-2.4.7/debian/patches/fix-ftbfs-pluginpackage.patch webkitgtk-2.4.8/debian/patches/fix-ftbfs-pluginpackage.patch
--- webkitgtk-2.4.7/debian/patches/fix-ftbfs-pluginpackage.patch	1970-01-01 02:00:00.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/fix-ftbfs-pluginpackage.patch	2015-01-17 14:19:53.000000000 +0200
@@ -0,0 +1,38 @@
+From: Tomas Popela <tpopela@redhat.com>
+Subject: Fix FTBFS because of duplicate symbols in Plugin{Package,View}None
+Bug: https://bugs.webkit.org/show_bug.cgi?id=140241
+Index: webkitgtk/Source/WebCore/GNUmakefile.list.am
+===================================================================
+--- webkitgtk.orig/Source/WebCore/GNUmakefile.list.am
++++ webkitgtk/Source/WebCore/GNUmakefile.list.am
+@@ -6254,9 +6254,13 @@ endif # END USE_GLX
+ endif # END TARGET_X11
+ 
+ if TARGET_WAYLAND
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_WAYLAND
+ 
+ if TARGET_X11_OR_WAYLAND
+@@ -6305,12 +6309,16 @@ webcoregtk_sources += \
+ endif # END TARGET_WIN32
+ 
+ if TARGET_QUARTZ
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_QUARTZ
+ 
+ if USE_GLES2
diff -Nru webkitgtk-2.4.7/debian/patches/flash-crash.patch webkitgtk-2.4.8/debian/patches/flash-crash.patch
--- webkitgtk-2.4.7/debian/patches/flash-crash.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/flash-crash.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,19 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Fix crash in the Flash plugin
-Bug: https://bugs.webkit.org/show_bug.cgi?id=137849
-Bug-Debian: http://bugs.debian.org/768929
-Index: webkitgtk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-===================================================================
---- webkitgtk.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ webkitgtk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -201,7 +201,9 @@ void NetscapePlugin::platformPreInitiali
- bool NetscapePlugin::platformPostInitialize()
- {
-     uint64_t windowID = 0;
--    bool needsXEmbed = false;
-+    // NPPVpluginNeedsXEmbed is a boolean value, but at least the
-+    // Flash player plugin is using an 'int' instead.
-+    int needsXEmbed = 0;
-     if (m_isWindowed) {
-         NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);
-         if (needsXEmbed) {
diff -Nru webkitgtk-2.4.7/debian/patches/local-label-string-hurd.patch webkitgtk-2.4.8/debian/patches/local-label-string-hurd.patch
--- webkitgtk-2.4.7/debian/patches/local-label-string-hurd.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/local-label-string-hurd.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,15 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Fix FTBFS in Hurd
-Forwarded: no
-Index: webkitgtk/Source/WTF/wtf/InlineASM.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/InlineASM.h
-+++ webkitgtk/Source/WTF/wtf/InlineASM.h
-@@ -84,6 +84,7 @@
- #elif   OS(LINUX)               \
-      || OS(FREEBSD)             \
-      || OS(OPENBSD)             \
-+     || OS(HURD)                \
-      || OS(NETBSD)
-     // GNU as-compatible syntax.
- #define LOCAL_LABEL_STRING(name) ".L" #name
diff -Nru webkitgtk-2.4.7/debian/patches/no-ssl-record-version.patch webkitgtk-2.4.8/debian/patches/no-ssl-record-version.patch
--- webkitgtk-2.4.7/debian/patches/no-ssl-record-version.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/no-ssl-record-version.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,29 +0,0 @@
-From: Carlos Alberto Lopez Perez <clopez@igalia.com>
-Subject: Don't use a SSL3.0 record version in client hello
-Origin: http://trac.webkit.org/changeset/176253
-Index: webkitgtk/Source/WebKit2/gtk/MainGtk.cpp
-===================================================================
---- webkitgtk.orig/Source/WebKit2/gtk/MainGtk.cpp
-+++ webkitgtk/Source/WebKit2/gtk/MainGtk.cpp
-@@ -38,7 +38,7 @@ int main(int argc, char** argv)
-     // overwrite this priority string if it's already set by the user.
-     // Keep this in sync with WebProcessMain.cpp.
-     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
--    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
-+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0", 0);
- 
-     return WebKit::WebProcessMainGtk(argc, argv);
- }
-Index: webkitgtk/Source/WebKit2/unix/NetworkMainUnix.cpp
-===================================================================
---- webkitgtk.orig/Source/WebKit2/unix/NetworkMainUnix.cpp
-+++ webkitgtk/Source/WebKit2/unix/NetworkMainUnix.cpp
-@@ -42,7 +42,7 @@ int main(int argc, char** argv)
-     // overwrite this priority string if it's already set by the user.
-     // Keep this in sync with WebProcessMain.cpp.
-     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
--    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
-+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0", 0);
- 
-     return WebKit::NetworkProcessMain(argc, argv);
- }
diff -Nru webkitgtk-2.4.7/debian/patches/nullptr-applystylecommand.patch webkitgtk-2.4.8/debian/patches/nullptr-applystylecommand.patch
--- webkitgtk-2.4.7/debian/patches/nullptr-applystylecommand.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/nullptr-applystylecommand.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,17 +0,0 @@
-From: Csaba Osztrogonác <ossy@webkit.org>
-Subject: Check for NULL pointer in ApplyStyleCommand
-Origin: http://trac.webkit.org/changeset/176182
-Index: webkitgtk/Source/WebCore/editing/ApplyStyleCommand.cpp
-===================================================================
---- webkitgtk.orig/Source/WebCore/editing/ApplyStyleCommand.cpp
-+++ webkitgtk/Source/WebCore/editing/ApplyStyleCommand.cpp
-@@ -267,6 +267,9 @@ void ApplyStyleCommand::applyBlockStyle(
- #else
-     Node* scope = highestEditableRoot(visibleStart.deepEquivalent());
- #endif
-+    if (!scope)
-+        return;
-+
-     RefPtr<Range> startRange = Range::create(document(), firstPositionInNode(scope), visibleStart.deepEquivalent().parentAnchoredEquivalent());
-     RefPtr<Range> endRange = Range::create(document(), firstPositionInNode(scope), visibleEnd.deepEquivalent().parentAnchoredEquivalent());
-     int startIndex = TextIterator::rangeLength(startRange.get(), true);
diff -Nru webkitgtk-2.4.7/debian/patches/protect-document.patch webkitgtk-2.4.8/debian/patches/protect-document.patch
--- webkitgtk-2.4.7/debian/patches/protect-document.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/protect-document.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,15 +0,0 @@
-From: David Kilzer <ddkilzer@apple.com>
-Subject: Protect Document in ProcessingInstruction::setXSLStyleSheet()
-Origin: http://trac.webkit.org/changeset/176014
-Index: webkitgtk/Source/WebCore/dom/ProcessingInstruction.cpp
-===================================================================
---- webkitgtk.orig/Source/WebCore/dom/ProcessingInstruction.cpp
-+++ webkitgtk/Source/WebCore/dom/ProcessingInstruction.cpp
-@@ -215,6 +215,7 @@ void ProcessingInstruction::setXSLStyleS
- {
-     ASSERT(m_isXSL);
-     m_sheet = XSLStyleSheet::create(this, href, baseURL);
-+    Ref<Document> protect(document());
-     parseStyleSheet(sheet);
- }
- #endif
diff -Nru webkitgtk-2.4.7/debian/patches/series webkitgtk-2.4.8/debian/patches/series
--- webkitgtk-2.4.7/debian/patches/series	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/series	2015-01-17 14:19:53.000000000 +0200
@@ -1,23 +1,16 @@
 fix-gtkdoc-error.patch
-dfg-jit.patch
 install-minibrowser.patch
 atomic_build_fix.patch
 restore_sparc_code.patch
-enable_llint.patch
 02_notebook_scroll.patch
 fix-textrel-x86.patch
 ftbfs-armhf.patch
-local-label-string-hurd.patch
 x32_support.patch
 fix-arm64-build.patch
 fix-mips64-build.patch
-touch-event.patch
-flash-crash.patch
 ppc64-align.patch
-no-ssl-record-version.patch
-protect-document.patch
 render-text-control.patch
 nullptr-frameprogresstracker.patch
-nullptr-applystylecommand.patch
 nullptr-accessibilitymenulistoption.patch
 ax-focus-events.patch
+fix-ftbfs-pluginpackage.patch
diff -Nru webkitgtk-2.4.7/debian/patches/touch-event.patch webkitgtk-2.4.8/debian/patches/touch-event.patch
--- webkitgtk-2.4.7/debian/patches/touch-event.patch	2014-12-08 14:26:31.000000000 +0200
+++ webkitgtk-2.4.8/debian/patches/touch-event.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,51 +0,0 @@
-From: Miyoung Shin <myid.shin@samsung.com>
-Subject: Fix crash during dispatching touchEvent created by JS
-Bug-Debian: https://bugs.debian.org/761492
-Bug: https://bugs.webkit.org/show_bug.cgi?id=138211
-Index: webkitgtk/Source/WebCore/dom/EventDispatcher.cpp
-===================================================================
---- webkitgtk.orig/Source/WebCore/dom/EventDispatcher.cpp
-+++ webkitgtk/Source/WebCore/dom/EventDispatcher.cpp
-@@ -91,7 +91,7 @@ public:
-     EventContext& contextAt(size_t i) { return *m_path[i]; }
- 
- #if ENABLE(TOUCH_EVENTS)
--    void updateTouchLists(const TouchEvent&);
-+    bool updateTouchLists(const TouchEvent&);
- #endif
-     void setRelatedTarget(EventTarget&);
- 
-@@ -312,8 +312,10 @@ bool EventDispatcher::dispatchEvent(Node
-     if (EventTarget* relatedTarget = event->relatedTarget())
-         eventPath.setRelatedTarget(*relatedTarget);
- #if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
--    if (event->isTouchEvent())
--        eventPath.updateTouchLists(*toTouchEvent(event.get()));
-+    if (event->isTouchEvent()) {
-+        if (!eventPath.updateTouchLists(*toTouchEvent(event.get())))
-+            return true;
-+    }
- #endif
- 
-     ChildNodesLazySnapshot::takeChildNodesLazySnapshot();
-@@ -432,8 +434,11 @@ static void addRelatedNodeResolversForTo
-         touchTargetResolvers.append(EventRelatedNodeResolver(*touchList->item(i), type));
- }
- 
--void EventPath::updateTouchLists(const TouchEvent& touchEvent)
-+bool EventPath::updateTouchLists(const TouchEvent& touchEvent)
- {
-+    if (!touchEvent.touches() || !touchEvent.targetTouches() || !touchEvent.changedTouches())
-+        return false;
-+
-     Vector<EventRelatedNodeResolver, 16> touchTargetResolvers;
-     const size_t touchNodeCount = touchEvent.touches()->length() + touchEvent.targetTouches()->length() + touchEvent.changedTouches()->length();
-     touchTargetResolvers.reserveInitialCapacity(touchNodeCount);
-@@ -454,6 +459,7 @@ void EventPath::updateTouchLists(const T
-             context.touchList(currentResolver.touchListType())->append(currentResolver.touch()->cloneWithNewTarget(nodeInCurrentTreeScope));
-         }
-     }
-+    return true;
- }
- #endif
- 
diff -Nru webkitgtk-2.4.7/Documentation/webkit2gtk/html/index.html webkitgtk-2.4.8/Documentation/webkit2gtk/html/index.html
--- webkitgtk-2.4.7/Documentation/webkit2gtk/html/index.html	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/Documentation/webkit2gtk/html/index.html	2015-01-07 12:14:30.000000000 +0200
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKit2GTK+ Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for WebKit2GTK+ 2.4.7</p></div>
+<div><p class="releaseinfo">for WebKit2GTK+ 2.4.8</p></div>
 </div>
 <hr>
 </div>
diff -Nru webkitgtk-2.4.7/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html webkitgtk-2.4.8/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html
--- webkitgtk-2.4.7/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html	2015-01-07 12:14:30.000000000 +0200
@@ -147,7 +147,7 @@
 <hr>
 <div class="refsect2">
 <a name="WEBKIT-MICRO-VERSION:CAPS"></a><h3>WEBKIT_MICRO_VERSION</h3>
-<pre class="programlisting">#define WEBKIT_MICRO_VERSION (7)
+<pre class="programlisting">#define WEBKIT_MICRO_VERSION (8)
 </pre>
 <p>Like <a class="link" href="webkit2gtk-WebKitVersion.html#webkit-get-micro-version" title="webkit_get_micro_version ()"><code class="function">webkit_get_micro_version()</code></a>, but from the headers used at
 application compile time, rather than from the library linked
diff -Nru webkitgtk-2.4.7/Documentation/webkit2gtk/html/WebKitPrintOperation.html webkitgtk-2.4.8/Documentation/webkit2gtk/html/WebKitPrintOperation.html
--- webkitgtk-2.4.7/Documentation/webkit2gtk/html/WebKitPrintOperation.html	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/Documentation/webkit2gtk/html/WebKitPrintOperation.html	2015-01-07 12:14:30.000000000 +0200
@@ -286,7 +286,7 @@
 webkit_print_operation_get_page_setup (<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>);</pre>
 <p>Return the current page setup of <em class="parameter"><code>print_operation</code></em>
 . It returns <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> until
-either <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-set-print-settings" title="webkit_print_operation_set_print_settings ()"><code class="function">webkit_print_operation_set_print_settings()</code></a> or <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-run-dialog" title="webkit_print_operation_run_dialog ()"><code class="function">webkit_print_operation_run_dialog()</code></a>
+either <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-set-page-setup" title="webkit_print_operation_set_page_setup ()"><code class="function">webkit_print_operation_set_page_setup()</code></a> or <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-run-dialog" title="webkit_print_operation_run_dialog ()"><code class="function">webkit_print_operation_run_dialog()</code></a>
 have been called.</p>
 <div class="refsect3">
 <a name="id-1.2.18.9.5.5"></a><h4>Parameters</h4>
diff -Nru webkitgtk-2.4.7/Documentation/webkitdomgtk/html/index.html webkitgtk-2.4.8/Documentation/webkitdomgtk/html/index.html
--- webkitgtk-2.4.7/Documentation/webkitdomgtk/html/index.html	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/Documentation/webkitdomgtk/html/index.html	2015-01-07 12:14:30.000000000 +0200
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKitDOMGTK+ Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for WebKitDOMGTK+ 2.4.7</p></div>
+<div><p class="releaseinfo">for WebKitDOMGTK+ 2.4.8</p></div>
 </div>
 <hr>
 </div>
diff -Nru webkitgtk-2.4.7/Documentation/webkitgtk/html/index.html webkitgtk-2.4.8/Documentation/webkitgtk/html/index.html
--- webkitgtk-2.4.7/Documentation/webkitgtk/html/index.html	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/Documentation/webkitgtk/html/index.html	2015-01-07 12:14:30.000000000 +0200
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKitGTK+ Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for WebKitGTK+ 2.4.7</p></div>
+<div><p class="releaseinfo">for WebKitGTK+ 2.4.8</p></div>
 </div>
 <hr>
 </div>
diff -Nru webkitgtk-2.4.7/GNUmakefile.in webkitgtk-2.4.8/GNUmakefile.in
--- webkitgtk-2.4.7/GNUmakefile.in	2014-10-22 13:38:30.000000000 +0300
+++ webkitgtk-2.4.8/GNUmakefile.in	2015-01-07 11:48:04.000000000 +0200
@@ -198,88 +198,93 @@
 @COMPILER_GCC_TRUE@am__append_4 = \
 @COMPILER_GCC_TRUE@	-fno-tree-dce
 
-@ENABLE_INTROSPECTION_TRUE@am__append_5 = JavaScriptCore-@WEBKITGTK_API_VERSION@.gir JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
-@USE_GEOCLUE2_TRUE@am__append_6 = \
+@OS_DARWIN_TRUE@am__append_5 = -ledit
+@ENABLE_INTROSPECTION_TRUE@am__append_6 = JavaScriptCore-@WEBKITGTK_API_VERSION@.gir JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
+@USE_GEOCLUE2_TRUE@am__append_7 = \
 @USE_GEOCLUE2_TRUE@	DerivedSources/Platform/Geoclue2Interface.h \
 @USE_GEOCLUE2_TRUE@	DerivedSources/Platform/Geoclue2Interface.c
 
-@TARGET_X11_TRUE@am__append_7 = \
+@TARGET_X11_TRUE@am__append_8 = \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/gtk2xtbin.c \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/gtk2xtbin.h \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/xembed.h
 
-@TARGET_X11_TRUE@am__append_8 = \
+@TARGET_X11_TRUE@am__append_9 = \
 @TARGET_X11_TRUE@	Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h \
 @TARGET_X11_TRUE@	Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp
 
-@TARGET_X11_TRUE@@USE_GLX_TRUE@am__append_9 = \
+@TARGET_X11_TRUE@@USE_GLX_TRUE@am__append_10 = \
 @TARGET_X11_TRUE@@USE_GLX_TRUE@	Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
 @TARGET_X11_TRUE@@USE_GLX_TRUE@	Source/WebCore/platform/graphics/glx/GLContextGLX.h
 
-@TARGET_X11_FALSE@am__append_10 = \
-@TARGET_X11_FALSE@	Source/WebCore/plugins/PluginPackageNone.cpp \
-@TARGET_X11_FALSE@	Source/WebCore/plugins/PluginViewNone.cpp
+@TARGET_WAYLAND_TRUE@am__append_11 = \
+@TARGET_WAYLAND_TRUE@	Source/WebCore/plugins/PluginPackageNone.cpp \
+@TARGET_WAYLAND_TRUE@	Source/WebCore/plugins/PluginViewNone.cpp
 
-@TARGET_X11_OR_WAYLAND_TRUE@am__append_11 = \
+@TARGET_X11_OR_WAYLAND_TRUE@am__append_12 = \
 @TARGET_X11_OR_WAYLAND_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
 @TARGET_X11_OR_WAYLAND_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
 
-@TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@am__append_12 = \
+@TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@am__append_13 = \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/graphics/GLContext.cpp \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/graphics/GLContext.h \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
 
-@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__append_13 = \
+@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__append_14 = \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@	Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@	Source/WebCore/platform/graphics/egl/GLContextEGL.h
 
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@am__append_14 = \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/DIBPixelData.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/DIBPixelData.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/LocalWindowsContext.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/SharedGDIObject.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/BitmapInfo.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/BitmapInfo.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/GDIObjectCounter.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/GDIObjectCounter.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/SystemInfo.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/SystemInfo.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/WebCoreInstanceHandle.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/WebCoreInstanceHandle.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/PluginDatabaseWin.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/PluginMessageThrottlerWin.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/PluginPackageWin.cpp
-
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@am__append_15 = \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/PluginViewWin.cpp
-
-@TARGET_WIN32_FALSE@@TARGET_X11_OR_WAYLAND_FALSE@am__append_16 = \
-@TARGET_WIN32_FALSE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/PluginPackageNone.cpp \
-@TARGET_WIN32_FALSE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/PluginViewNone.cpp
+@TARGET_WIN32_TRUE@am__append_15 = \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/DIBPixelData.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/DIBPixelData.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/LocalWindowsContext.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/SharedGDIObject.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/TransformationMatrixWin.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/BitmapInfo.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/BitmapInfo.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/GDIObjectCounter.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/GDIObjectCounter.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/SystemInfo.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/SystemInfo.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/WebCoreInstanceHandle.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/WebCoreInstanceHandle.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/PluginDatabaseWin.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/PluginMessageThrottlerWin.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/PluginPackageWin.cpp
+
+@TARGET_WIN32_TRUE@am__append_16 = \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/PluginViewWin.cpp
+
+@TARGET_QUARTZ_TRUE@am__append_17 = \
+@TARGET_QUARTZ_TRUE@	Source/WebCore/plugins/PluginPackageNone.cpp \
+@TARGET_QUARTZ_TRUE@	Source/WebCore/plugins/PluginViewNone.cpp
+
+@TARGET_QUARTZ_TRUE@am__append_18 = \
+@TARGET_QUARTZ_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+@TARGET_QUARTZ_TRUE@	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
 
-@USE_GLES2_TRUE@am__append_17 = \
+@USE_GLES2_TRUE@am__append_19 = \
 @USE_GLES2_TRUE@	Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp \
 @USE_GLES2_TRUE@	Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h \
 @USE_GLES2_TRUE@	Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \
 @USE_GLES2_TRUE@	Source/WebCore/platform/graphics/OpenGLESShims.h
 
-@USE_GLES2_FALSE@am__append_18 = \
+@USE_GLES2_FALSE@am__append_20 = \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/OpenGLShims.cpp \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/OpenGLShims.h
 
-@USE_GSTREAMER_TRUE@am__append_19 = \
+@USE_GSTREAMER_TRUE@am__append_21 = \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp \
@@ -298,7 +303,7 @@
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h
 
-@USE_GSTREAMER_TRUE@am__append_20 = \
+@USE_GSTREAMER_TRUE@am__append_22 = \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp \
@@ -310,7 +315,7 @@
 # ---
 # Accelerated compositing support
 # ---
-@USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@am__append_21 = \
+@USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@am__append_23 = \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/TextureMapperGL.h \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp \
@@ -343,28 +348,28 @@
 # ---
 # Windows plugin support
 # ---
-@TARGET_WIN32_TRUE@am__append_22 = \
+@TARGET_WIN32_TRUE@am__append_24 = \
 @TARGET_WIN32_TRUE@	-I$(srcdir)/Source/WebCore/platform/graphics/win
 
-@ENABLE_SVG_TRUE@am__append_23 = $(WebCore)/css/SVGCSSPropertyNames.in
-@ENABLE_SVG_TRUE@am__append_24 = $(WebCore)/css/SVGCSSValueKeywords.in
-@USE_TEXTURE_MAPPER_GL_TRUE@am__append_25 = \
+@ENABLE_SVG_TRUE@am__append_25 = $(WebCore)/css/SVGCSSPropertyNames.in
+@ENABLE_SVG_TRUE@am__append_26 = $(WebCore)/css/SVGCSSValueKeywords.in
+@USE_TEXTURE_MAPPER_GL_TRUE@am__append_27 = \
 @USE_TEXTURE_MAPPER_GL_TRUE@	-I$(srcdir)/Source/WebCore/platform/graphics/texmap
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_26 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_28 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	-DWTF_USE_LEVELDB=1 \
 @ENABLE_INDEXED_DATABASE_TRUE@	-I$(srcdir)/Source/ThirdParty/leveldb \
 @ENABLE_INDEXED_DATABASE_TRUE@	-I$(srcdir)/Source/ThirdParty/leveldb/include
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_27 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_29 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	-DWTF_USE_LEVELDB=1 \
 @ENABLE_INDEXED_DATABASE_TRUE@	-I$(srcdir)/Source/ThirdParty/leveldb \
 @ENABLE_INDEXED_DATABASE_TRUE@	-I$(srcdir)/Source/ThirdParty/leveldb/include
 
-@ENABLE_SVG_TRUE@am__append_28 = \
+@ENABLE_SVG_TRUE@am__append_30 = \
 @ENABLE_SVG_TRUE@	libWebCoreSVG.la
 
-@ENABLE_VIDEO_TRUE@am__append_29 = \
+@ENABLE_VIDEO_TRUE@am__append_31 = \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMAudioTrack.h \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMAudioTrackList.h \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMHTMLAudioElement.h \
@@ -378,7 +383,7 @@
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMVideoTrack.h \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMVideoTrackList.h
 
-@ENABLE_VIDEO_TRUE@am__append_30 = \
+@ENABLE_VIDEO_TRUE@am__append_32 = \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMHTMLAudioElement.cpp \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMHTMLAudioElementPrivate.h \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMHTMLVideoElement.cpp \
@@ -399,69 +404,69 @@
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMTrackEvent.cpp \
 @ENABLE_VIDEO_TRUE@	DerivedSources/webkitdom/WebKitDOMTrackEventPrivate.h
 
-@ENABLE_WEBKIT1_TRUE@am__append_31 = \
+@ENABLE_WEBKIT1_TRUE@am__append_33 = \
 @ENABLE_WEBKIT1_TRUE@	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 @ENABLE_WEBKIT1_TRUE@	Source/WebKit/gtk/docs/webkitgtk-docs.sgml \
 @ENABLE_WEBKIT1_TRUE@	Source/WebKit/gtk/docs/webkitgtk-sections.txt \
 @ENABLE_WEBKIT1_TRUE@	gtkdoc-webkitgtk.cfg
 
-@ENABLE_WEBKIT2_TRUE@am__append_32 = \
+@ENABLE_WEBKIT2_TRUE@am__append_34 = \
 @ENABLE_WEBKIT2_TRUE@	libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 @ENABLE_WEBKIT2_TRUE@	Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
 @ENABLE_WEBKIT2_TRUE@	Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt \
 @ENABLE_WEBKIT2_TRUE@	gtkdoc-webkit2gtk.cfg
 
-@ENABLE_GTK_DOC_TRUE@am__append_33 = docs-build.stamp
-@ENABLE_WEBKIT1_TRUE@am__append_34 = \
+@ENABLE_GTK_DOC_TRUE@am__append_35 = docs-build.stamp
+@ENABLE_WEBKIT1_TRUE@am__append_36 = \
 @ENABLE_WEBKIT1_TRUE@	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
-@ENABLE_SPELLCHECK_TRUE@am__append_35 = \
+@ENABLE_SPELLCHECK_TRUE@am__append_37 = \
 @ENABLE_SPELLCHECK_TRUE@	Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp \
 @ENABLE_SPELLCHECK_TRUE@	Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h
 
-@ENABLE_DEVELOPER_MODE_FALSE@am__append_36 = \
+@ENABLE_DEVELOPER_MODE_FALSE@am__append_38 = \
 @ENABLE_DEVELOPER_MODE_FALSE@	$(version_script)
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_37 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_39 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	libLevelDB.la
 
-@USE_OPENGL_TRUE@am__append_38 = \
+@USE_OPENGL_TRUE@am__append_40 = \
 @USE_OPENGL_TRUE@	libANGLE.la
 
-@ENABLE_SVG_TRUE@am__append_39 = \
+@ENABLE_SVG_TRUE@am__append_41 = \
 @ENABLE_SVG_TRUE@	libWebCoreSVG.la
 
-@ENABLE_WEBKIT1_TRUE@am__append_40 = Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_41 = WebKit-@WEBKITGTK_API_VERSION@.gir
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_42 = WebKit-@WEBKITGTK_API_VERSION@.typelib
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_43 = WebKit-@WEBKITGTK_API_VERSION@.gir WebKit-@WEBKITGTK_API_VERSION@.typelib
-@ENABLE_WEBKIT1_TRUE@am__append_44 = gtkdoc-webkitgtk.cfg
-@ENABLE_WEBKIT1_TRUE@am__append_45 = \
+@ENABLE_WEBKIT1_TRUE@am__append_42 = Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_43 = WebKit-@WEBKITGTK_API_VERSION@.gir
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_44 = WebKit-@WEBKITGTK_API_VERSION@.typelib
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_45 = WebKit-@WEBKITGTK_API_VERSION@.gir WebKit-@WEBKITGTK_API_VERSION@.typelib
+@ENABLE_WEBKIT1_TRUE@am__append_46 = gtkdoc-webkitgtk.cfg
+@ENABLE_WEBKIT1_TRUE@am__append_47 = \
 @ENABLE_WEBKIT1_TRUE@	Programs/GtkLauncher
 
-@TARGET_X11_TRUE@am__append_46 = \
+@TARGET_X11_TRUE@am__append_48 = \
 @TARGET_X11_TRUE@	Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp \
 @TARGET_X11_TRUE@	Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
 
-@TARGET_X11_FALSE@am__append_47 = \
+@TARGET_X11_FALSE@am__append_49 = \
 @TARGET_X11_FALSE@	Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp \
 @TARGET_X11_FALSE@	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
 
-@USE_TEXTURE_MAPPER_GL_TRUE@am__append_48 = \
+@USE_TEXTURE_MAPPER_GL_TRUE@am__append_50 = \
 @USE_TEXTURE_MAPPER_GL_TRUE@   Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp \
 @USE_TEXTURE_MAPPER_GL_TRUE@   Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
 
-@TARGET_X11_TRUE@am__append_49 = \
+@TARGET_X11_TRUE@am__append_51 = \
 @TARGET_X11_TRUE@	Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp \
 @TARGET_X11_TRUE@	Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
 
-@TARGET_X11_FALSE@am__append_50 = \
+@TARGET_X11_FALSE@am__append_52 = \
 @TARGET_X11_FALSE@	Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp \
 @TARGET_X11_FALSE@	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
 
 
 # Shared libraries
-@ENABLE_WEBKIT2_TRUE@am__append_51 = \
+@ENABLE_WEBKIT2_TRUE@am__append_53 = \
 @ENABLE_WEBKIT2_TRUE@	libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
 
@@ -469,70 +474,70 @@
 
 # We need to make sure plugin process is always built with gtk2, because plugins like flash
 # still use gtk2. Since webcore was built with gtk3, we need to build webcoregtk sources again with gtk2
-@ENABLE_WEBKIT2_TRUE@am__append_52 = libWebKit2Platform.la \
+@ENABLE_WEBKIT2_TRUE@am__append_54 = libWebKit2Platform.la \
 @ENABLE_WEBKIT2_TRUE@	libPlatformGtk2.la libWebCoreGtk2.la
-@ENABLE_WEBKIT2_TRUE@am__append_53 = Programs/WebKitPluginProcess \
+@ENABLE_WEBKIT2_TRUE@am__append_55 = Programs/WebKitPluginProcess \
 @ENABLE_WEBKIT2_TRUE@	Programs/WebKitNetworkProcess \
 @ENABLE_WEBKIT2_TRUE@	Programs/WebKitWebProcess
-@ENABLE_DEVELOPER_MODE_FALSE@am__append_54 = \
+@ENABLE_DEVELOPER_MODE_FALSE@am__append_56 = \
 @ENABLE_DEVELOPER_MODE_FALSE@	$(version_script)
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_55 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_57 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	libLevelDB.la
 
-@USE_OPENGL_TRUE@am__append_56 = \
+@USE_OPENGL_TRUE@am__append_58 = \
 @USE_OPENGL_TRUE@	libANGLE.la
 
-@ENABLE_SVG_TRUE@am__append_57 = \
+@ENABLE_SVG_TRUE@am__append_59 = \
 @ENABLE_SVG_TRUE@	libWebCoreSVG.la
 
-@ENABLE_WEBKIT2_TRUE@am__append_58 = \
+@ENABLE_WEBKIT2_TRUE@am__append_60 = \
 @ENABLE_WEBKIT2_TRUE@	Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc \
 @ENABLE_WEBKIT2_TRUE@	Source/WebKit2/webkit2gtk-web-extension-@WEBKITGTK_API_VERSION@.pc
 
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_59 = WebKit2-@WEBKITGTK_API_VERSION@.gir \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_61 = WebKit2-@WEBKITGTK_API_VERSION@.gir \
 @ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@	WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_60 = WebKit2-@WEBKITGTK_API_VERSION@.typelib \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_62 = WebKit2-@WEBKITGTK_API_VERSION@.typelib \
 @ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@	WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib
-@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_61 = WebKit2-@WEBKITGTK_API_VERSION@.gir \
+@ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_63 = WebKit2-@WEBKITGTK_API_VERSION@.gir \
 @ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@	WebKit2-@WEBKITGTK_API_VERSION@.typelib \
 @ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@	WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir \
 @ENABLE_INTROSPECTION_TRUE@@ENABLE_WEBKIT2_TRUE@	WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib
-@ENABLE_WEBKIT1_TRUE@am__append_62 = \
+@ENABLE_WEBKIT1_TRUE@am__append_64 = \
 @ENABLE_WEBKIT1_TRUE@	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
-@ENABLE_SVG_TRUE@am__append_63 = \
+@ENABLE_SVG_TRUE@am__append_65 = \
 @ENABLE_SVG_TRUE@	libWebCoreSVG.la
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_64 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_66 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	libLevelDB.la
 
-@USE_OPENGL_TRUE@am__append_65 = \
+@USE_OPENGL_TRUE@am__append_67 = \
 @USE_OPENGL_TRUE@	libANGLE.la
 
-@ENABLE_WEBKIT2_TRUE@am__append_66 = gtkdoc-webkit2gtk.cfg
-@ENABLE_WEBKIT2_TRUE@am__append_67 = \
+@ENABLE_WEBKIT2_TRUE@am__append_68 = gtkdoc-webkit2gtk.cfg
+@ENABLE_WEBKIT2_TRUE@am__append_69 = \
 @ENABLE_WEBKIT2_TRUE@	Programs/MiniBrowser
 
-@USE_OPENGL_TRUE@am__append_68 = \
+@USE_OPENGL_TRUE@am__append_70 = \
 @USE_OPENGL_TRUE@	libANGLE.la
 
-@ENABLE_INDEXED_DATABASE_TRUE@am__append_69 = \
+@ENABLE_INDEXED_DATABASE_TRUE@am__append_71 = \
 @ENABLE_INDEXED_DATABASE_TRUE@	libLevelDB.la
 
-@OS_WIN32_TRUE@am__append_70 = \
+@OS_WIN32_TRUE@am__append_72 = \
 @OS_WIN32_TRUE@	-DOS_WIN
 
-@OS_WIN32_FALSE@am__append_71 = \
+@OS_WIN32_FALSE@am__append_73 = \
 @OS_WIN32_FALSE@	-pthread
 
-@OS_LINUX_TRUE@am__append_72 = \
+@OS_LINUX_TRUE@am__append_74 = \
 @OS_LINUX_TRUE@	-DOS_LINUX
 
-@OS_FREEBSD_TRUE@am__append_73 = \
+@OS_FREEBSD_TRUE@am__append_75 = \
 @OS_FREEBSD_TRUE@	-DOS_FREEBSD
 
-@OS_DARWIN_TRUE@am__append_74 = \
+@OS_DARWIN_TRUE@am__append_76 = \
 @OS_DARWIN_TRUE@	-DOS_MACOSX
 
 
@@ -540,12 +545,12 @@
 # We must split off the window.internals implementation into a separate
 # convenience library because it requires a different include path order
 # to prefer the WebCore config.h over the DumpRenderTree config.h
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_75 = Libraries/libgtest.la \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_77 = Libraries/libgtest.la \
 @ENABLE_DEVELOPER_MODE_TRUE@	libWebCoreInternals.la
 
 # gtest source files that we don't compile directly.  They are
 # #included by gtest-all.cc.
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_76 = Source/ThirdParty/gtest/src/gtest.cc \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_78 = Source/ThirdParty/gtest/src/gtest.cc \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/ThirdParty/gtest/src/gtest-death-test.cc \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/ThirdParty/gtest/src/gtest-filepath.cc \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/ThirdParty/gtest/src/gtest-internal-inl.h \
@@ -589,13 +594,13 @@
 @ENABLE_DEVELOPER_MODE_TRUE@	$(srcdir)/Source/WebCore/bindings/scripts/generate-bindings.pl \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(shell ls \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings/*.idl)
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_77 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_79 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/ImageDiff
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_78 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_80 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/DumpRenderTree
 
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_79 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_81 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/InternalSettingsGenerated.cpp \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/InternalSettingsGenerated.h   \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/JSMallocStatistics.cpp \
@@ -611,15 +616,15 @@
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/JSTypeConversions.cpp \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/JSTypeConversions.h
 
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_80 = $(libwebcoreinternals_built_sources) \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_82 = $(libwebcoreinternals_built_sources) \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(top_builddir)/stamp-testwebkitapi-webcore-forwarding-headers
-@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_OR_WAYLAND_TRUE@am__append_81 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_OR_WAYLAND_TRUE@am__append_83 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_OR_WAYLAND_TRUE@	-DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_OR_WAYLAND_TRUE@	-DFONTS_CONF_DIR=\"${shell pwd}/${srcdir}/Tools/DumpRenderTree/gtk/fonts\"
 
 
 # clean target
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_82 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_84 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/DumpRenderTree \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/GtkLauncher \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/ImageDiff
@@ -627,29 +632,29 @@
 
 # Build TestNetscapePlugin only for X11
 # since we don't support plugins for non-X11 builds at the moment.
-@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@am__append_83 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@am__append_85 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	TestNetscapePlugin/libTestNetscapePlugin.la
 
 
 # For the Gtk port we want to use XP_UNIX both on X11 and Mac
-@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_WIN32_FALSE@@TARGET_X11_TRUE@am__append_84 = -DXP_UNIX
-@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@am__append_85 = TestNetscapePlugin/libTestNetscapePlugin.la
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_86 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_WIN32_FALSE@@TARGET_X11_TRUE@am__append_86 = -DXP_UNIX
+@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@am__append_87 = TestNetscapePlugin/libTestNetscapePlugin.la
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_88 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Libraries/libTestWebKitAPIMain.la
 
 
 # The InjectedBundle library allows the render process to load harness code.
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_87 = Libraries/libTestWebKit2GtkAPI.la \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_89 = Libraries/libTestWebKit2GtkAPI.la \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Libraries/libTestWebKitAPIInjectedBundle.la \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Libraries/WebExtensions/libWebExtensionTest.la \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Libraries/WebExtensions/libWebProcessTest.la \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Libraries/libTestRunnerInjectedBundle.la
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_88 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_90 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/TestWebKitAPI/WTF/TestWTF \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/TestWebKitAPI/WebCore/TestWebCore
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_89 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@am__append_91 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
@@ -679,7 +684,7 @@
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/TestWebKitAPI/WebKitGtk/testkeyevents \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT1_TRUE@	Programs/TestWebKitAPI/WebKitGtk/testcopyandpaste
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_90 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_92 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
@@ -708,32 +713,32 @@
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebViewGroup \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@@HAVE_ATSPI2_TRUE@am__append_91 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@@HAVE_ATSPI2_TRUE@am__append_93 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@@HAVE_ATSPI2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@@HAVE_ATSPI2_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_SVG_TRUE@am__append_92 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_SVG_TRUE@am__append_94 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_SVG_TRUE@	libWebCoreSVG.la
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_INDEXED_DATABASE_TRUE@am__append_93 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_INDEXED_DATABASE_TRUE@am__append_95 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_INDEXED_DATABASE_TRUE@	libLevelDB.la
 
-@ENABLE_DEVELOPER_MODE_TRUE@@USE_OPENGL_TRUE@am__append_94 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@USE_OPENGL_TRUE@am__append_96 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@USE_OPENGL_TRUE@	libANGLE.la
 
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_95 =  \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_97 =  \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(top_builddir)/libWebCoreLayer.a \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_96 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_98 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
 
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_97 = $(top_builddir)/stamp-testwebkitapi-webkit2-forwarding-headers
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_98 = $(top_builddir)/stamp-webkittestrunner-forwarding-headers \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_99 = $(top_builddir)/stamp-testwebkitapi-webkit2-forwarding-headers
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_100 = $(top_builddir)/stamp-webkittestrunner-forwarding-headers \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(webkittestrunner_built_sources)
-@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_99 = \
+@ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@am__append_101 = \
 @ENABLE_DEVELOPER_MODE_TRUE@@ENABLE_WEBKIT2_TRUE@	Programs/WebKitTestRunner
 
-@ENABLE_DEVELOPER_MODE_TRUE@am__append_100 = \
+@ENABLE_DEVELOPER_MODE_TRUE@am__append_102 = \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/InjectedBundle/JSAccessibilityController.cpp \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/InjectedBundle/JSAccessibilityTextMarker.cpp \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/InjectedBundle/JSAccessibilityTextMarkerRange.cpp \
@@ -2356,7 +2361,8 @@
 @TARGET_X11_OR_WAYLAND_TRUE@am__objects_10 = Source/WebCore/platform/cairo/libPlatformGtk_la-WidgetBackingStoreCairo.lo
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@am__objects_11 = Source/WebCore/platform/graphics/libPlatformGtk_la-GLContext.lo \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/gtk/libPlatformGtk_la-RedirectedXCompositeWindow.lo
-am__objects_12 = Source/WebCore/platform/audio/gtk/libPlatformGtk_la-AudioBusGtk.lo \
+@TARGET_QUARTZ_TRUE@am__objects_12 = Source/WebCore/platform/cairo/libPlatformGtk_la-WidgetBackingStoreCairo.lo
+am__objects_13 = Source/WebCore/platform/audio/gtk/libPlatformGtk_la-AudioBusGtk.lo \
 	Source/WebCore/platform/graphics/cairo/libPlatformGtk_la-GraphicsContextCairo.lo \
 	Source/WebCore/platform/graphics/freetype/libPlatformGtk_la-FontPlatformDataFreeType.lo \
 	Source/WebCore/platform/graphics/gstreamer/libPlatformGtk_la-ImageGStreamerCairo.lo \
@@ -2400,8 +2406,9 @@
 	Source/WebCore/platform/gtk/libPlatformGtk_la-WidgetGtk.lo \
 	Source/WebCore/platform/network/gtk/libPlatformGtk_la-CredentialBackingStore.lo \
 	Source/WebCore/platform/text/gtk/libPlatformGtk_la-TextBreakIteratorInternalICUGtk.lo \
-	$(am__objects_9) $(am__objects_10) $(am__objects_11)
-am_libPlatformGtk_la_OBJECTS = $(am__objects_12)
+	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
+	$(am__objects_12)
+am_libPlatformGtk_la_OBJECTS = $(am__objects_13)
 libPlatformGtk_la_OBJECTS = $(am_libPlatformGtk_la_OBJECTS)
 libPlatformGtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -2485,11 +2492,12 @@
 	Source/WebCore/platform/graphics/GLContext.h \
 	Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
 	Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
-@TARGET_X11_TRUE@am__objects_13 = Source/WebCore/platform/gtk/libPlatformGtk2_la-WidgetBackingStoreGtkX11.lo
-@TARGET_X11_OR_WAYLAND_TRUE@am__objects_14 = Source/WebCore/platform/cairo/libPlatformGtk2_la-WidgetBackingStoreCairo.lo
-@TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@am__objects_15 = Source/WebCore/platform/graphics/libPlatformGtk2_la-GLContext.lo \
+@TARGET_X11_TRUE@am__objects_14 = Source/WebCore/platform/gtk/libPlatformGtk2_la-WidgetBackingStoreGtkX11.lo
+@TARGET_X11_OR_WAYLAND_TRUE@am__objects_15 = Source/WebCore/platform/cairo/libPlatformGtk2_la-WidgetBackingStoreCairo.lo
+@TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@am__objects_16 = Source/WebCore/platform/graphics/libPlatformGtk2_la-GLContext.lo \
 @TARGET_X11_OR_WAYLAND_TRUE@@USE_OPENGL_TRUE@	Source/WebCore/platform/gtk/libPlatformGtk2_la-RedirectedXCompositeWindow.lo
-am__objects_16 = Source/WebCore/platform/audio/gtk/libPlatformGtk2_la-AudioBusGtk.lo \
+@TARGET_QUARTZ_TRUE@am__objects_17 = Source/WebCore/platform/cairo/libPlatformGtk2_la-WidgetBackingStoreCairo.lo
+am__objects_18 = Source/WebCore/platform/audio/gtk/libPlatformGtk2_la-AudioBusGtk.lo \
 	Source/WebCore/platform/graphics/cairo/libPlatformGtk2_la-GraphicsContextCairo.lo \
 	Source/WebCore/platform/graphics/freetype/libPlatformGtk2_la-FontPlatformDataFreeType.lo \
 	Source/WebCore/platform/graphics/gstreamer/libPlatformGtk2_la-ImageGStreamerCairo.lo \
@@ -2533,8 +2541,9 @@
 	Source/WebCore/platform/gtk/libPlatformGtk2_la-WidgetGtk.lo \
 	Source/WebCore/platform/network/gtk/libPlatformGtk2_la-CredentialBackingStore.lo \
 	Source/WebCore/platform/text/gtk/libPlatformGtk2_la-TextBreakIteratorInternalICUGtk.lo \
-	$(am__objects_13) $(am__objects_14) $(am__objects_15)
-am_libPlatformGtk2_la_OBJECTS = $(am__objects_16)
+	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
+	$(am__objects_17)
+am_libPlatformGtk2_la_OBJECTS = $(am__objects_18)
 libPlatformGtk2_la_OBJECTS = $(am_libPlatformGtk2_la_OBJECTS)
 libPlatformGtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -2544,7 +2553,7 @@
 am__DEPENDENCIES_1 =
 libWTF_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_17 = Source/WTF/wtf/libWTF_la-Assertions.lo \
+am__objects_19 = Source/WTF/wtf/libWTF_la-Assertions.lo \
 	Source/WTF/wtf/libWTF_la-Atomics.lo \
 	Source/WTF/wtf/libWTF_la-BitVector.lo \
 	Source/WTF/wtf/libWTF_la-CompilationThread.lo \
@@ -2613,7 +2622,7 @@
 	Source/WTF/wtf/unicode/libWTF_la-CollatorDefault.lo \
 	Source/WTF/wtf/unicode/libWTF_la-UTF8.lo \
 	Source/WTF/wtf/unicode/icu/libWTF_la-CollatorICU.lo
-am_libWTF_la_OBJECTS = $(am__objects_17)
+am_libWTF_la_OBJECTS = $(am__objects_19)
 libWTF_la_OBJECTS = $(am_libWTF_la_OBJECTS)
 libWTF_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libWTF_la_CXXFLAGS) \
@@ -5214,27 +5223,27 @@
 	Source/WebCore/platform/graphics/texmap/TextureMapperTile.h \
 	Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp \
 	Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h
-@TARGET_X11_FALSE@am__objects_18 = Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
-@TARGET_X11_FALSE@	Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@am__objects_19 = Source/WebCore/platform/graphics/win/libWebCore_la-DIBPixelData.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/libWebCore_la-GraphicsContextCairoWin.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/libWebCore_la-GraphicsContextWin.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/graphics/win/libWebCore_la-TransformationMatrixWin.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/libWebCore_la-BitmapInfo.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/libWebCore_la-GDIObjectCounter.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/libWebCore_la-SystemInfo.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/platform/win/libWebCore_la-WebCoreInstanceHandle.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/libWebCore_la-PluginDatabaseWin.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/libWebCore_la-PluginMessageThrottlerWin.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/libWebCore_la-PluginPackageWin.lo
-@TARGET_WIN32_FALSE@@TARGET_X11_OR_WAYLAND_FALSE@am__objects_20 = Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
-@TARGET_WIN32_FALSE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo
-@USE_GLES2_TRUE@am__objects_21 = Source/WebCore/platform/graphics/opengl/libWebCore_la-Extensions3DOpenGLES.lo \
+@TARGET_WAYLAND_TRUE@am__objects_20 = Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
+@TARGET_WAYLAND_TRUE@	Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo
+@TARGET_WIN32_TRUE@am__objects_21 = Source/WebCore/platform/graphics/win/libWebCore_la-DIBPixelData.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/libWebCore_la-GraphicsContextCairoWin.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/libWebCore_la-GraphicsContextWin.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/graphics/win/libWebCore_la-TransformationMatrixWin.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/libWebCore_la-BitmapInfo.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/libWebCore_la-GDIObjectCounter.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/libWebCore_la-SystemInfo.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/platform/win/libWebCore_la-WebCoreInstanceHandle.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/libWebCore_la-PluginDatabaseWin.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/libWebCore_la-PluginMessageThrottlerWin.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/libWebCore_la-PluginPackageWin.lo
+@TARGET_QUARTZ_TRUE@am__objects_22 = Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
+@TARGET_QUARTZ_TRUE@	Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo
+@USE_GLES2_TRUE@am__objects_23 = Source/WebCore/platform/graphics/opengl/libWebCore_la-Extensions3DOpenGLES.lo \
 @USE_GLES2_TRUE@	Source/WebCore/platform/graphics/opengl/libWebCore_la-GraphicsContext3DOpenGLES.lo
-@USE_GLES2_FALSE@am__objects_22 = Source/WebCore/platform/graphics/opengl/libWebCore_la-Extensions3DOpenGL.lo \
+@USE_GLES2_FALSE@am__objects_24 = Source/WebCore/platform/graphics/opengl/libWebCore_la-Extensions3DOpenGL.lo \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/opengl/libWebCore_la-GraphicsContext3DOpenGL.lo \
 @USE_GLES2_FALSE@	Source/WebCore/platform/graphics/libWebCore_la-OpenGLShims.lo
-@USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@am__objects_23 = Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperGL.lo \
+@USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@am__objects_25 = Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperGL.lo \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperShaderProgram.lo \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/libWebCore_la-GraphicsLayerTextureMapper.lo \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/libWebCore_la-GraphicsLayerTransform.lo \
@@ -5247,7 +5256,7 @@
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperSurfaceBackingStore.lo \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperTile.lo \
 @USE_ACCELERATED_COMPOSITING_TRUE@@USE_TEXTURE_MAPPER_GL_TRUE@	Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperTiledBackingStore.lo
-am__objects_24 = Source/WebCore/accessibility/libWebCore_la-AccessibilityARIAGridCell.lo \
+am__objects_26 = Source/WebCore/accessibility/libWebCore_la-AccessibilityARIAGridCell.lo \
 	Source/WebCore/accessibility/libWebCore_la-AccessibilityARIAGrid.lo \
 	Source/WebCore/accessibility/libWebCore_la-AccessibilityARIAGridRow.lo \
 	Source/WebCore/accessibility/libWebCore_la-AccessibilityImageMapLink.lo \
@@ -6448,10 +6457,10 @@
 	Source/WebCore/xml/libWebCore_la-XSLTProcessor.lo \
 	Source/WebCore/xml/libWebCore_la-XSLTProcessorLibxslt.lo \
 	Source/WebCore/xml/libWebCore_la-XSLTUnicodeSort.lo \
-	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
-	$(am__objects_21) $(am__objects_22) $(am__objects_23)
-am_libWebCore_la_OBJECTS = $(am__objects_24)
-am__objects_25 = DerivedSources/WebCore/libWebCore_la-CSSGrammar.lo \
+	$(am__objects_20) $(am__objects_21) $(am__objects_22) \
+	$(am__objects_23) $(am__objects_24) $(am__objects_25)
+am_libWebCore_la_OBJECTS = $(am__objects_26)
+am__objects_27 = DerivedSources/WebCore/libWebCore_la-CSSGrammar.lo \
 	DerivedSources/WebCore/libWebCore_la-CSSPropertyNames.lo \
 	DerivedSources/WebCore/libWebCore_la-CSSValueKeywords.lo \
 	DerivedSources/WebCore/libWebCore_la-EventFactory.lo \
@@ -6883,7 +6892,7 @@
 	DerivedSources/WebCore/libWebCore_la-SVGNames.lo \
 	DerivedSources/WebCore/libWebCore_la-SVGElementFactory.lo \
 	DerivedSources/WebInspectorUI/libWebCore_la-GResourceBundle.lo
-nodist_libWebCore_la_OBJECTS = $(am__objects_25)
+nodist_libWebCore_la_OBJECTS = $(am__objects_27)
 libWebCore_la_OBJECTS = $(am_libWebCore_la_OBJECTS) \
 	$(nodist_libWebCore_la_OBJECTS)
 libWebCore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -6970,14 +6979,14 @@
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
 	Source/WebCore/plugins/win/PluginViewWin.cpp
-@TARGET_X11_TRUE@am__objects_26 = Source/WebCore/plugins/gtk/libWebCoreGtk_la-gtk2xtbin.lo \
+@TARGET_X11_TRUE@am__objects_28 = Source/WebCore/plugins/gtk/libWebCoreGtk_la-gtk2xtbin.lo \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/libWebCoreGtk_la-PluginPackageGtk.lo \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/libWebCoreGtk_la-PluginViewGtk.lo
-@TARGET_X11_TRUE@@USE_GLX_TRUE@am__objects_27 = Source/WebCore/platform/graphics/glx/libWebCoreGtk_la-GLContextGLX.lo
-@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__objects_28 = Source/WebCore/platform/graphics/egl/libWebCoreGtk_la-GLContextEGL.lo
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@am__objects_29 = Source/WebCore/platform/cairo/libWebCoreGtk_la-WidgetBackingStoreCairo.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/libWebCoreGtk_la-PluginViewWin.lo
-am__objects_30 = Source/WebCore/accessibility/atk/libWebCoreGtk_la-AccessibilityObjectAtk.lo \
+@TARGET_X11_TRUE@@USE_GLX_TRUE@am__objects_29 = Source/WebCore/platform/graphics/glx/libWebCoreGtk_la-GLContextGLX.lo
+@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__objects_30 = Source/WebCore/platform/graphics/egl/libWebCoreGtk_la-GLContextEGL.lo
+@TARGET_WIN32_TRUE@am__objects_31 = Source/WebCore/platform/cairo/libWebCoreGtk_la-WidgetBackingStoreCairo.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/libWebCoreGtk_la-PluginViewWin.lo
+am__objects_32 = Source/WebCore/accessibility/atk/libWebCoreGtk_la-AccessibilityObjectAtk.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk_la-AXObjectCacheAtk.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk_la-WebKitAccessibleHyperlink.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk_la-WebKitAccessibleInterfaceAction.lo \
@@ -7017,9 +7026,9 @@
 	Source/WebCore/platform/gtk/libWebCoreGtk_la-ScrollbarThemeGtk2.lo \
 	Source/WebCore/platform/gtk/libWebCoreGtk_la-ScrollbarThemeGtk3.lo \
 	Source/WebCore/platform/gtk/libWebCoreGtk_la-WidgetRenderingContext.lo \
-	$(am__objects_26) $(am__objects_27) $(am__objects_28) \
-	$(am__objects_29)
-am_libWebCoreGtk_la_OBJECTS = $(am__objects_30)
+	$(am__objects_28) $(am__objects_29) $(am__objects_30) \
+	$(am__objects_31)
+am_libWebCoreGtk_la_OBJECTS = $(am__objects_32)
 libWebCoreGtk_la_OBJECTS = $(am_libWebCoreGtk_la_OBJECTS)
 libWebCoreGtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -7105,14 +7114,14 @@
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
 	Source/WebCore/plugins/win/PluginViewWin.cpp
-@TARGET_X11_TRUE@am__objects_31 = Source/WebCore/plugins/gtk/libWebCoreGtk2_la-gtk2xtbin.lo \
+@TARGET_X11_TRUE@am__objects_33 = Source/WebCore/plugins/gtk/libWebCoreGtk2_la-gtk2xtbin.lo \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/libWebCoreGtk2_la-PluginPackageGtk.lo \
 @TARGET_X11_TRUE@	Source/WebCore/plugins/gtk/libWebCoreGtk2_la-PluginViewGtk.lo
-@TARGET_X11_TRUE@@USE_GLX_TRUE@am__objects_32 = Source/WebCore/platform/graphics/glx/libWebCoreGtk2_la-GLContextGLX.lo
-@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__objects_33 = Source/WebCore/platform/graphics/egl/libWebCoreGtk2_la-GLContextEGL.lo
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@am__objects_34 = Source/WebCore/platform/cairo/libWebCoreGtk2_la-WidgetBackingStoreCairo.lo \
-@TARGET_WIN32_TRUE@@TARGET_X11_OR_WAYLAND_FALSE@	Source/WebCore/plugins/win/libWebCoreGtk2_la-PluginViewWin.lo
-am__objects_35 = Source/WebCore/accessibility/atk/libWebCoreGtk2_la-AccessibilityObjectAtk.lo \
+@TARGET_X11_TRUE@@USE_GLX_TRUE@am__objects_34 = Source/WebCore/platform/graphics/glx/libWebCoreGtk2_la-GLContextGLX.lo
+@TARGET_X11_OR_WAYLAND_TRUE@@USE_EGL_TRUE@am__objects_35 = Source/WebCore/platform/graphics/egl/libWebCoreGtk2_la-GLContextEGL.lo
+@TARGET_WIN32_TRUE@am__objects_36 = Source/WebCore/platform/cairo/libWebCoreGtk2_la-WidgetBackingStoreCairo.lo \
+@TARGET_WIN32_TRUE@	Source/WebCore/plugins/win/libWebCoreGtk2_la-PluginViewWin.lo
+am__objects_37 = Source/WebCore/accessibility/atk/libWebCoreGtk2_la-AccessibilityObjectAtk.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk2_la-AXObjectCacheAtk.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk2_la-WebKitAccessibleHyperlink.lo \
 	Source/WebCore/accessibility/atk/libWebCoreGtk2_la-WebKitAccessibleInterfaceAction.lo \
@@ -7152,9 +7161,9 @@
 	Source/WebCore/platform/gtk/libWebCoreGtk2_la-ScrollbarThemeGtk2.lo \
 	Source/WebCore/platform/gtk/libWebCoreGtk2_la-ScrollbarThemeGtk3.lo \
 	Source/WebCore/platform/gtk/libWebCoreGtk2_la-WidgetRenderingContext.lo \
-	$(am__objects_31) $(am__objects_32) $(am__objects_33) \
-	$(am__objects_34)
-am_libWebCoreGtk2_la_OBJECTS = $(am__objects_35)
+	$(am__objects_33) $(am__objects_34) $(am__objects_35) \
+	$(am__objects_36)
+am_libWebCoreGtk2_la_OBJECTS = $(am__objects_37)
 libWebCoreGtk2_la_OBJECTS = $(am_libWebCoreGtk2_la_OBJECTS)
 libWebCoreGtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -7178,16 +7187,16 @@
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/WebCore/testing/libWebCoreInternals_la-Internals.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/WebCore/testing/libWebCoreInternals_la-InternalSettings.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/WebCore/testing/js/libWebCoreInternals_la-WebCoreTestSupport.lo
-@ENABLE_DEVELOPER_MODE_TRUE@am__objects_36 = DerivedSources/WebCore/libWebCoreInternals_la-InternalSettingsGenerated.lo \
+@ENABLE_DEVELOPER_MODE_TRUE@am__objects_38 = DerivedSources/WebCore/libWebCoreInternals_la-InternalSettingsGenerated.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSMallocStatistics.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSMemoryInfo.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSInternals.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSInternalSettings.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSInternalSettingsGenerated.lo \
 @ENABLE_DEVELOPER_MODE_TRUE@	DerivedSources/WebCore/libWebCoreInternals_la-JSTypeConversions.lo
-am__objects_37 = $(am__objects_36)
+am__objects_39 = $(am__objects_38)
 @ENABLE_DEVELOPER_MODE_TRUE@nodist_libWebCoreInternals_la_OBJECTS =  \
-@ENABLE_DEVELOPER_MODE_TRUE@	$(am__objects_37)
+@ENABLE_DEVELOPER_MODE_TRUE@	$(am__objects_39)
 libWebCoreInternals_la_OBJECTS = $(am_libWebCoreInternals_la_OBJECTS) \
 	$(nodist_libWebCoreInternals_la_OBJECTS)
 libWebCoreInternals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -7196,7 +7205,7 @@
 	$(LDFLAGS) -o $@
 @ENABLE_DEVELOPER_MODE_TRUE@am_libWebCoreInternals_la_rpath =
 libWebCoreModules_la_LIBADD =
-am__objects_38 = Source/WebCore/Modules/battery/libWebCoreModules_la-BatteryController.lo \
+am__objects_40 = Source/WebCore/Modules/battery/libWebCoreModules_la-BatteryController.lo \
 	Source/WebCore/Modules/battery/libWebCoreModules_la-BatteryManager.lo \
 	Source/WebCore/Modules/battery/libWebCoreModules_la-BatteryStatus.lo \
 	Source/WebCore/Modules/battery/libWebCoreModules_la-NavigatorBattery.lo \
@@ -7387,7 +7396,7 @@
 	Source/WebCore/Modules/websockets/libWebCoreModules_la-WebSocketFrame.lo \
 	Source/WebCore/Modules/websockets/libWebCoreModules_la-WebSocketHandshake.lo \
 	Source/WebCore/Modules/websockets/libWebCoreModules_la-WorkerThreadableWebSocketChannel.lo
-am_libWebCoreModules_la_OBJECTS = $(am__objects_38)
+am_libWebCoreModules_la_OBJECTS = $(am__objects_40)
 libWebCoreModules_la_OBJECTS = $(am_libWebCoreModules_la_OBJECTS)
 libWebCoreModules_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -7613,10 +7622,10 @@
 	Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.h \
 	Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp \
 	Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.h
-@USE_GSTREAMER_TRUE@am__objects_39 = Source/WebCore/platform/graphics/gstreamer/libWebCorePlatform_la-SourceBufferPrivateGStreamer.lo \
+@USE_GSTREAMER_TRUE@am__objects_41 = Source/WebCore/platform/graphics/gstreamer/libWebCorePlatform_la-SourceBufferPrivateGStreamer.lo \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/libWebCorePlatform_la-MediaSourceGStreamer.lo \
 @USE_GSTREAMER_TRUE@	Source/WebCore/platform/graphics/gstreamer/libWebCorePlatform_la-WebKitMediaSourceGStreamer.lo
-am__objects_40 = Source/WebCore/platform/animation/libWebCorePlatform_la-Animation.lo \
+am__objects_42 = Source/WebCore/platform/animation/libWebCorePlatform_la-Animation.lo \
 	Source/WebCore/platform/animation/libWebCorePlatform_la-AnimationList.lo \
 	Source/WebCore/platform/audio/libWebCorePlatform_la-HRTFDatabase.lo \
 	Source/WebCore/platform/audio/libWebCorePlatform_la-HRTFDatabaseLoader.lo \
@@ -7713,8 +7722,8 @@
 	Source/WebCore/platform/libWebCorePlatform_la-ScrollAnimatorNone.lo \
 	Source/WebCore/platform/libWebCorePlatform_la-ThreadGlobalData.lo \
 	Source/WebCore/platform/libWebCorePlatform_la-UserActivity.lo \
-	$(am__objects_39)
-am_libWebCorePlatform_la_OBJECTS = $(am__objects_40)
+	$(am__objects_41)
+am_libWebCorePlatform_la_OBJECTS = $(am__objects_42)
 libWebCorePlatform_la_OBJECTS = $(am_libWebCorePlatform_la_OBJECTS)
 libWebCorePlatform_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -8235,7 +8244,7 @@
 	Source/WebCore/svg/SVGZoomAndPan.h \
 	Source/WebCore/svg/SVGZoomEvent.cpp \
 	Source/WebCore/svg/SVGZoomEvent.h
-am__objects_41 = Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGElementInstanceCustom.lo \
+am__objects_43 = Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGElementInstanceCustom.lo \
 	Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGLengthCustom.lo \
 	Source/WebCore/bindings/js/libWebCoreSVG_la-JSSVGPathSegCustom.lo \
 	Source/WebCore/css/libWebCoreSVG_la-SVGCSSComputedStyleDeclaration.lo \
@@ -8463,8 +8472,8 @@
 	Source/WebCore/svg/libWebCoreSVG_la-SVGVKernElement.lo \
 	Source/WebCore/svg/libWebCoreSVG_la-SVGZoomAndPan.lo \
 	Source/WebCore/svg/libWebCoreSVG_la-SVGZoomEvent.lo
-@ENABLE_SVG_TRUE@am_libWebCoreSVG_la_OBJECTS = $(am__objects_41)
-am__objects_42 =  \
+@ENABLE_SVG_TRUE@am_libWebCoreSVG_la_OBJECTS = $(am__objects_43)
+am__objects_44 =  \
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGAElement.lo \
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGAltGlyphDefElement.lo \
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGAltGlyphElement.lo \
@@ -8609,7 +8618,7 @@
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGVKernElement.lo \
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGZoomAndPan.lo \
 	DerivedSources/WebCore/libWebCoreSVG_la-JSSVGZoomEvent.lo
-@ENABLE_SVG_TRUE@nodist_libWebCoreSVG_la_OBJECTS = $(am__objects_42)
+@ENABLE_SVG_TRUE@nodist_libWebCoreSVG_la_OBJECTS = $(am__objects_44)
 libWebCoreSVG_la_OBJECTS = $(am_libWebCoreSVG_la_OBJECTS) \
 	$(nodist_libWebCoreSVG_la_OBJECTS)
 libWebCoreSVG_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -8618,7 +8627,7 @@
 	$(LDFLAGS) -o $@
 @ENABLE_SVG_TRUE@am_libWebCoreSVG_la_rpath =
 libWebKit2Platform_la_LIBADD =
-am__objects_43 = Source/WebKit2/Platform/IPC/libWebKit2Platform_la-ArgumentCoders.lo \
+am__objects_45 = Source/WebKit2/Platform/IPC/libWebKit2Platform_la-ArgumentCoders.lo \
 	Source/WebKit2/Platform/IPC/libWebKit2Platform_la-ArgumentDecoder.lo \
 	Source/WebKit2/Platform/IPC/libWebKit2Platform_la-ArgumentEncoder.lo \
 	Source/WebKit2/Platform/IPC/libWebKit2Platform_la-Attachment.lo \
@@ -8638,7 +8647,7 @@
 	Source/WebKit2/Platform/libWebKit2Platform_la-Module.lo \
 	Source/WebKit2/Platform/unix/libWebKit2Platform_la-SharedMemoryUnix.lo \
 	Source/WebKit2/Platform/libWebKit2Platform_la-WorkQueue.lo
-am_libWebKit2Platform_la_OBJECTS = $(am__objects_43)
+am_libWebKit2Platform_la_OBJECTS = $(am__objects_45)
 libWebKit2Platform_la_OBJECTS = $(am_libWebKit2Platform_la_OBJECTS)
 libWebKit2Platform_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -8648,7 +8657,7 @@
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_DEPENDENCIES =  \
 	libWTF.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_44 = Source/JavaScriptCore/API/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-JSBase.lo \
+am__objects_46 = Source/JavaScriptCore/API/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-JSBase.lo \
 	Source/JavaScriptCore/API/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-JSCTestRunnerUtils.lo \
 	Source/JavaScriptCore/API/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-JSCallbackConstructor.lo \
 	Source/JavaScriptCore/API/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-JSCallbackFunction.lo \
@@ -9109,10 +9118,10 @@
 	DerivedSources/JavaScriptCore/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-InspectorJSFrontendDispatchers.lo \
 	DerivedSources/JavaScriptCore/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-InspectorJSTypeBuilders.lo
 am_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_44)
-am__objects_45 =
+	$(am__objects_46)
+am__objects_47 =
 nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_45)
+	$(am__objects_47)
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS = $(am_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS) \
 	$(nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS)
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LINK =  \
@@ -9124,7 +9133,7 @@
 	$(LDFLAGS) -o $@
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_DEPENDENCIES =  \
 	libWebCore.la libWebCorePlatform.la libWebCoreModules.la \
-	$(am__append_55) $(am__append_56) $(am__append_57) \
+	$(am__append_57) $(am__append_58) $(am__append_59) \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 	libPlatform.la libPlatformGtk.la libGObjectDOMBindings.la \
 	libWebCoreGtk.la libWebKit2Platform.la $(am__DEPENDENCIES_1) \
@@ -10217,12 +10226,12 @@
 	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
-@TARGET_X11_TRUE@am__objects_46 = Source/WebKit2/Shared/Plugins/Netscape/x11/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginModuleX11.lo \
+@TARGET_X11_TRUE@am__objects_48 = Source/WebKit2/Shared/Plugins/Netscape/x11/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginModuleX11.lo \
 @TARGET_X11_TRUE@	Source/WebKit2/WebProcess/Plugins/Netscape/x11/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginX11.lo
-@TARGET_X11_FALSE@am__objects_47 = Source/WebKit2/Shared/Plugins/Netscape/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginModuleNone.lo \
+@TARGET_X11_FALSE@am__objects_49 = Source/WebKit2/Shared/Plugins/Netscape/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginModuleNone.lo \
 @TARGET_X11_FALSE@	Source/WebKit2/WebProcess/Plugins/Netscape/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetscapePluginNone.lo
-@USE_TEXTURE_MAPPER_GL_TRUE@am__objects_48 = Source/WebKit2/WebProcess/WebPage/gtk/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-LayerTreeHostGtk.lo
-am__objects_49 = Source/WebKit2/NetworkProcess/FileAPI/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetworkBlobRegistry.lo \
+@USE_TEXTURE_MAPPER_GL_TRUE@am__objects_50 = Source/WebKit2/WebProcess/WebPage/gtk/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-LayerTreeHostGtk.lo
+am__objects_51 = Source/WebKit2/NetworkProcess/FileAPI/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetworkBlobRegistry.lo \
 	Source/WebKit2/NetworkProcess/soup/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NetworkProcessSoup.lo \
 	Source/WebKit2/NetworkProcess/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-AsynchronousNetworkLoaderClient.lo \
 	Source/WebKit2/NetworkProcess/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-HostRecord.lo \
@@ -10700,10 +10709,10 @@
 	Source/WebKit2/WebProcess/WebPage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebUndoStep.lo \
 	Source/WebKit2/WebProcess/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebConnectionToUIProcess.lo \
 	Source/WebKit2/WebProcess/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebProcess.lo \
-	$(am__objects_46) $(am__objects_47) $(am__objects_48)
+	$(am__objects_48) $(am__objects_49) $(am__objects_50)
 am_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_49)
-am__objects_50 = DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-AuthenticationManagerMessageReceiver.lo \
+	$(am__objects_51)
+am__objects_52 = DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-AuthenticationManagerMessageReceiver.lo \
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-CustomProtocolManagerProxyMessageReceiver.lo \
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-CustomProtocolManagerMessageReceiver.lo \
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-DownloadProxyMessageReceiver.lo \
@@ -10759,11 +10768,11 @@
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebResourceCacheManagerProxyMessageReceiver.lo \
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebResourceLoaderMessageReceiver.lo \
 	DerivedSources/WebKit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebVibrationProxyMessageReceiver.lo
-am__objects_51 = DerivedSources/WebKit2/webkit2gtk/webkit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebKitEnumTypes.lo \
+am__objects_53 = DerivedSources/WebKit2/webkit2gtk/webkit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebKitEnumTypes.lo \
 	DerivedSources/WebKit2/webkit2gtk/webkit2/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebKitMarshal.lo \
 	DerivedSources/WebInspectorUI/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebKit2GResourceBundle.lo
 nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_50) $(am__objects_51)
+	$(am__objects_52) $(am__objects_53)
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS = $(am_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS) \
 	$(nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS)
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LINK =  \
@@ -10788,8 +10797,8 @@
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_DEPENDENCIES =  \
 	libPlatform.la libPlatformGtk.la libWebCore.la \
 	libWebCorePlatform.la libWebCoreModules.la \
-	libGObjectDOMBindings.la libWebCoreGtk.la $(am__append_37) \
-	$(am__append_38) $(am__append_39) \
+	libGObjectDOMBindings.la libWebCoreGtk.la $(am__append_39) \
+	$(am__append_40) $(am__append_41) \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -10910,8 +10919,8 @@
 	Source/WebKit/gtk/webkit/webkitwebviewprivate.h \
 	Source/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
 	Source/WebKit/gtk/webkit/webkitwebwindowfeaturesprivate.h
-@ENABLE_SPELLCHECK_TRUE@am__objects_52 = Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-TextCheckerClientGtk.lo
-am__objects_53 = $(am__objects_52) \
+@ENABLE_SPELLCHECK_TRUE@am__objects_54 = Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-TextCheckerClientGtk.lo
+am__objects_55 = $(am__objects_54) \
 	Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-AcceleratedCompositingContextGL.lo \
 	Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-AssertMatchingEnums.lo \
 	Source/WebKit/gtk/WebCoreSupport/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-BatteryClientGtk.lo \
@@ -10966,12 +10975,12 @@
 	Source/WebKit/gtk/webkit/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-webkitwebview.lo \
 	Source/WebKit/gtk/webkit/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-webkitwebwindowfeatures.lo
 am_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_53)
-am__objects_54 = DerivedSources/webkit/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-webkitenumtypes.lo \
+	$(am__objects_55)
+am__objects_56 = DerivedSources/webkit/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-webkitenumtypes.lo \
 	DerivedSources/webkit/libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-webkitmarshal.lo \
-	$(am__objects_45)
+	$(am__objects_47)
 nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS =  \
-	$(am__objects_54)
+	$(am__objects_56)
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS = $(am_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS) \
 	$(nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS)
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LINK =  \
@@ -11184,8 +11193,8 @@
 	Tools/MiniBrowser/gtk/Programs_MiniBrowser-BrowserSettingsDialog.$(OBJEXT) \
 	Tools/MiniBrowser/gtk/Programs_MiniBrowser-BrowserWindow.$(OBJEXT) \
 	Tools/MiniBrowser/gtk/Programs_MiniBrowser-main.$(OBJEXT)
-am__objects_55 = DerivedSources/WebKit2/Programs_MiniBrowser-BrowserMarshal.$(OBJEXT)
-nodist_Programs_MiniBrowser_OBJECTS = $(am__objects_55)
+am__objects_57 = DerivedSources/WebKit2/Programs_MiniBrowser-BrowserMarshal.$(OBJEXT)
+nodist_Programs_MiniBrowser_OBJECTS = $(am__objects_57)
 Programs_MiniBrowser_OBJECTS = $(am_Programs_MiniBrowser_OBJECTS) \
 	$(nodist_Programs_MiniBrowser_OBJECTS)
 Programs_MiniBrowser_DEPENDENCIES = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
@@ -12255,11 +12264,11 @@
 	Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp \
 	Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp \
 	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
-@TARGET_X11_TRUE@am__objects_56 = Source/WebKit2/Shared/Plugins/Netscape/x11/Programs_WebKitPluginProcess-NetscapePluginModuleX11.$(OBJEXT) \
+@TARGET_X11_TRUE@am__objects_58 = Source/WebKit2/Shared/Plugins/Netscape/x11/Programs_WebKitPluginProcess-NetscapePluginModuleX11.$(OBJEXT) \
 @TARGET_X11_TRUE@	Source/WebKit2/WebProcess/Plugins/Netscape/x11/Programs_WebKitPluginProcess-NetscapePluginX11.$(OBJEXT)
-@TARGET_X11_FALSE@am__objects_57 = Source/WebKit2/Shared/Plugins/Netscape/Programs_WebKitPluginProcess-NetscapePluginModuleNone.$(OBJEXT) \
+@TARGET_X11_FALSE@am__objects_59 = Source/WebKit2/Shared/Plugins/Netscape/Programs_WebKitPluginProcess-NetscapePluginModuleNone.$(OBJEXT) \
 @TARGET_X11_FALSE@	Source/WebKit2/WebProcess/Plugins/Netscape/Programs_WebKitPluginProcess-NetscapePluginNone.$(OBJEXT)
-am__objects_58 = Source/WebKit2/PluginProcess/Programs_WebKitPluginProcess-PluginControllerProxy.$(OBJEXT) \
+am__objects_60 = Source/WebKit2/PluginProcess/Programs_WebKitPluginProcess-PluginControllerProxy.$(OBJEXT) \
 	Source/WebKit2/PluginProcess/Programs_WebKitPluginProcess-PluginCreationParameters.$(OBJEXT) \
 	Source/WebKit2/PluginProcess/Programs_WebKitPluginProcess-PluginProcess.$(OBJEXT) \
 	Source/WebKit2/PluginProcess/Programs_WebKitPluginProcess-WebProcessConnection.$(OBJEXT) \
@@ -12297,13 +12306,13 @@
 	Source/WebKit2/WebProcess/Plugins/Netscape/Programs_WebKitPluginProcess-NetscapePlugin.$(OBJEXT) \
 	Source/WebKit2/WebProcess/Plugins/Netscape/Programs_WebKitPluginProcess-NetscapePluginStream.$(OBJEXT) \
 	Source/WebKit2/unix/Programs_WebKitPluginProcess-PluginMainUnix.$(OBJEXT) \
-	$(am__objects_56) $(am__objects_57)
-am_Programs_WebKitPluginProcess_OBJECTS = $(am__objects_58)
-am__objects_59 = DerivedSources/WebKit2/Programs_WebKitPluginProcess-NPObjectMessageReceiverMessageReceiver.$(OBJEXT) \
+	$(am__objects_58) $(am__objects_59)
+am_Programs_WebKitPluginProcess_OBJECTS = $(am__objects_60)
+am__objects_61 = DerivedSources/WebKit2/Programs_WebKitPluginProcess-NPObjectMessageReceiverMessageReceiver.$(OBJEXT) \
 	DerivedSources/WebKit2/Programs_WebKitPluginProcess-PluginControllerProxyMessageReceiver.$(OBJEXT) \
 	DerivedSources/WebKit2/Programs_WebKitPluginProcess-PluginProcessMessageReceiver.$(OBJEXT) \
 	DerivedSources/WebKit2/Programs_WebKitPluginProcess-WebProcessConnectionMessageReceiver.$(OBJEXT)
-nodist_Programs_WebKitPluginProcess_OBJECTS = $(am__objects_59)
+nodist_Programs_WebKitPluginProcess_OBJECTS = $(am__objects_61)
 Programs_WebKitPluginProcess_OBJECTS =  \
 	$(am_Programs_WebKitPluginProcess_OBJECTS) \
 	$(nodist_Programs_WebKitPluginProcess_OBJECTS)
@@ -12396,7 +12405,7 @@
 Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_OBJECTS =  \
 	$(am_Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_OBJECTS)
 Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_DEPENDENCIES = libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) \
@@ -12992,7 +13001,7 @@
 
 # Libraries and support components
 bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
-noinst_DATA := $(am__append_33) $(am__append_96)
+noinst_DATA := $(am__append_35) $(am__append_98)
 noinst_HEADERS := 
 
 # We have a different library with only the files that require GTK+. It allows us
@@ -13002,12 +13011,12 @@
 # the common libWebCore and two libWebCoreGtk, one using gtk3 and the other one using gtk2.
 noinst_LTLIBRARIES := libWTF.la libPlatform.la libPlatformGtk.la \
 	libWebCorePlatform.la libWebCoreModules.la libWebCore.la \
-	$(am__append_28) libWebCoreGtk.la libGObjectDOMBindings.la \
-	$(am__append_52) $(am__append_68) $(am__append_69) \
-	$(am__append_75) $(am__append_83) $(am__append_86) \
-	$(am__append_87)
+	$(am__append_30) libWebCoreGtk.la libGObjectDOMBindings.la \
+	$(am__append_54) $(am__append_70) $(am__append_71) \
+	$(am__append_77) $(am__append_85) $(am__append_88) \
+	$(am__append_89)
 lib_LTLIBRARIES := libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-	$(am__append_34) $(am__append_51)
+	$(am__append_36) $(am__append_53)
 IDL_BINDINGS := 
 POFILES := $(shell ls $(srcdir)/Source/WebCore/platform/gtk/po/*.po)
 PO_LINGUAS := $(patsubst \
@@ -15079,11 +15088,11 @@
 	-I$(srcdir)/Source/ThirdParty/ANGLE/include \
 	-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
 	-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
-	-I$(top_builddir)/DerivedSources/Platform $(am__append_27)
+	-I$(top_builddir)/DerivedSources/Platform $(am__append_29)
 platform_built_sources := DerivedSources/Platform/ColorData.cpp \
 	DerivedSources/Platform/WebKitFontFamilyNames.cpp \
 	DerivedSources/Platform/WebKitFontFamilyNames.h \
-	$(am__append_6)
+	$(am__append_7)
 platform_sources :=  \
 	Source/WebCore/platform/animation/AnimationUtilities.h \
 	Source/WebCore/platform/animation/TimingFunction.h \
@@ -15666,7 +15675,7 @@
 	Source/WebCore/platform/Widget.cpp \
 	Source/WebCore/platform/Widget.h \
 	Source/WebCore/platform/WindowsKeyboardCodes.h \
-	$(am__append_19)
+	$(am__append_21)
 platformgtk_cppflags :=  \
 	-DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
 	-DDATA_DIR=\"${datadir}\"
@@ -15739,7 +15748,8 @@
 	Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp \
 	Source/WebCore/platform/network/gtk/CredentialBackingStore.h \
 	Source/WebCore/platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
-	$(am__append_8) $(am__append_11) $(am__append_12)
+	$(am__append_9) $(am__append_12) $(am__append_13) \
+	$(am__append_18)
 webcore_platform_sources :=  \
 	Source/WebCore/platform/animation/Animation.cpp \
 	Source/WebCore/platform/animation/Animation.h \
@@ -15952,7 +15962,7 @@
 	Source/WebCore/platform/ThreadGlobalData.cpp \
 	Source/WebCore/platform/ThreadGlobalData.h \
 	Source/WebCore/platform/UserActivity.cpp \
-	Source/WebCore/platform/UserActivity.h $(am__append_20)
+	Source/WebCore/platform/UserActivity.h $(am__append_22)
 webcore_modules_sources :=  \
 	Source/WebCore/Modules/battery/BatteryClient.h \
 	Source/WebCore/Modules/battery/BatteryController.cpp \
@@ -17316,7 +17326,7 @@
 	-I$(top_builddir)/DerivedSources/WebCore \
 	-I$(top_builddir)/DerivedSources \
 	-I$(top_builddir)/DerivedSources/JavaScriptCore \
-	$(am__append_25) $(am__append_26)
+	$(am__append_27) $(am__append_28)
 webcore_sources :=  \
 	Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp \
 	Source/WebCore/accessibility/AccessibilityARIAGridCell.h \
@@ -19857,9 +19867,9 @@
 	Source/WebCore/xml/XSLTProcessor.h \
 	Source/WebCore/xml/XSLTProcessorLibxslt.cpp \
 	Source/WebCore/xml/XSLTUnicodeSort.cpp \
-	Source/WebCore/xml/XSLTUnicodeSort.h $(am__append_10) \
-	$(am__append_14) $(am__append_16) $(am__append_17) \
-	$(am__append_18) $(am__append_21)
+	Source/WebCore/xml/XSLTUnicodeSort.h $(am__append_11) \
+	$(am__append_15) $(am__append_17) $(am__append_19) \
+	$(am__append_20) $(am__append_23)
 webcore_libadd := 
 
 # These files need to be part of WebCore otherwise they cause undefined
@@ -20803,8 +20813,8 @@
 	Source/WebCore/platform/gtk/ScrollbarThemeGtk3.cpp \
 	Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \
 	Source/WebCore/platform/gtk/WidgetRenderingContext.h \
-	$(am__append_7) $(am__append_9) $(am__append_13) \
-	$(am__append_15)
+	$(am__append_8) $(am__append_10) $(am__append_14) \
+	$(am__append_16)
 webcoregtk_cppflags :=  \
 	-DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
 	-I$(srcdir)/Source/WebCore/accessibility/atk \
@@ -20824,7 +20834,7 @@
 	-I$(srcdir)/Source/WebCore/platform/mediastream/gstreamer \
 	-I$(srcdir)/Source/WebCore/platform/network/soup \
 	-I$(srcdir)/Source/WebCore/platform/text/enchant \
-	$(am__append_22)
+	$(am__append_24)
 webkitgtk_built_h_api := Source/WebKit/gtk/webkit/webkitversion.h
 webkitgtk_static_h_api := $(srcdir)/Source/WebKit/gtk/webkit/webkit.h \
 	$(srcdir)/Source/WebKit/gtk/webkit/webkitapplicationcache.h \
@@ -20859,7 +20869,7 @@
 	$(srcdir)/Source/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
 	$(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h
 webkitgtk_h_api := $(webkitgtk_built_h_api) $(webkitgtk_static_h_api)
-webkitgtk_sources := $(am__append_35) \
+webkitgtk_sources := $(am__append_37) \
 	Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
 	Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
 	Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
@@ -21111,7 +21121,7 @@
 	DerivedSources/webkitdom/WebKitDOMPerformanceTiming.h \
 	DerivedSources/webkitdom/WebKitDOMWheelEvent.h \
 	DerivedSources/webkitdom/webkitdom.h \
-	DerivedSources/webkitdom/webkitdomdefines.h $(am__append_29)
+	DerivedSources/webkitdom/webkitdomdefines.h $(am__append_31)
 webkitgtk_gdom_built_sources :=  \
 	DerivedSources/webkitdom/WebKitDOMAttr.cpp \
 	DerivedSources/webkitdom/WebKitDOMAttrPrivate.h \
@@ -21397,7 +21407,7 @@
 	DerivedSources/webkitdom/WebKitDOMXPathNSResolverPrivate.h \
 	DerivedSources/webkitdom/WebKitDOMXPathResult.cpp \
 	DerivedSources/webkitdom/WebKitDOMXPathResultPrivate.h \
-	$(am__append_30)
+	$(am__append_32)
 
 # webkitenumtypes.{h,cpp} cannot be in webkitgtk_built_h_api, because
 # the rule that builds it depends on webkitgtk_built_h_api (circular dependency).
@@ -22475,8 +22485,8 @@
 	Source/WebKit2/WebProcess/WebConnectionToUIProcess.h \
 	Source/WebKit2/WebProcess/WebProcessSupplement.h \
 	Source/WebKit2/WebProcess/WebProcess.cpp \
-	Source/WebKit2/WebProcess/WebProcess.h $(am__append_46) \
-	$(am__append_47) $(am__append_48)
+	Source/WebKit2/WebProcess/WebProcess.h $(am__append_48) \
+	$(am__append_49) $(am__append_50)
 webkit2_built_sources := DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
 	DerivedSources/WebKit2/AuthenticationManagerMessages.h \
 	DerivedSources/WebKit2/CustomProtocolManagerProxyMessageReceiver.cpp \
@@ -22750,8 +22760,8 @@
 	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h \
 	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
 	Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \
-	Source/WebKit2/unix/PluginMainUnix.cpp $(am__append_49) \
-	$(am__append_50)
+	Source/WebKit2/unix/PluginMainUnix.cpp $(am__append_51) \
+	$(am__append_52)
 webkit2_plugin_process_built_sources := DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
 	DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
 	DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
@@ -22760,8 +22770,8 @@
 	DerivedSources/WebKit2/PluginProcessMessages.h \
 	DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
 	DerivedSources/WebKit2/WebProcessConnectionMessages.h
-webkittestrunner_built_sources := $(am__append_100)
-libwebcoreinternals_built_sources := $(am__append_79)
+webkittestrunner_built_sources := $(am__append_102)
+libwebcoreinternals_built_sources := $(am__append_81)
 minibrowser_built_sources := DerivedSources/WebKit2/BrowserMarshal.h \
 	DerivedSources/WebKit2/BrowserMarshal.c
 global_cppflags := -Wall -W -Wcast-align -Wchar-subscripts \
@@ -22971,7 +22981,7 @@
 	$(WebKit2)/WebProcess/WebPage/*.in) $(shell ls \
 	$(WebKit2)/WebProcess/soup/*.in) \
 	$(srcdir)/Tools/MiniBrowser/gtk/browser-marshal.list \
-	$(am__append_76)
+	$(am__append_78)
 
 # Include module makefiles
 
@@ -22982,12 +22992,12 @@
 BUILT_SOURCES := $(webkitgtk_gdom_built_h_api) \
 	$(webkitgtk_gdom_built_sources) gtkdoc-webkitdom.cfg \
 	DerivedSources/WebInspectorUI/GResourceBundle.xml \
-	$(webkitgtk_built_sources) $(am__append_44) \
+	$(webkitgtk_built_sources) $(am__append_46) \
 	$(top_builddir)/stamp-webkit2-forwarding-headers \
 	$(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2 \
 	$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2 \
-	$(am__append_66) $(minibrowser_built_sources) $(am__append_80) \
-	$(am__append_97) $(am__append_98) \
+	$(am__append_68) $(minibrowser_built_sources) $(am__append_82) \
+	$(am__append_99) $(am__append_100) \
 	$(javascriptcore_built_sources) \
 	$(javascriptcore_built_nosources) $(platform_built_sources) \
 	$(webcore_built_sources) $(webcore_built_nosources) \
@@ -23003,12 +23013,12 @@
 CLEANFILES := $(javascriptcore_built_nosources) Programs/jsc \
 	Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ \
 	Programs/LLIntOffsetsExtractor Programs/minidom \
-	$(am__append_5) $(top_builddir)/stamp-po $(am__append_43) \
+	$(am__append_6) $(top_builddir)/stamp-po $(am__append_45) \
 	$(BUILT_SOURCES) $(top_builddir)/stamp-webkitmarshal.cpp \
 	$(top_builddir)/stamp-webkitmarshal.h \
 	$(top_builddir)/stamp-webkitenumtypes.cpp \
 	$(top_builddir)/stamp-webkitenumtypes.h \
-	$(top_builddir)/Programs/GtkLauncher $(am__append_61) \
+	$(top_builddir)/Programs/GtkLauncher $(am__append_63) \
 	$(BUILT_SOURCES) $(top_builddir)/stamp-webkit2enumtypes \
 	$(top_builddir)/stamp-webkit2marshal.cpp \
 	$(top_builddir)/stamp-webkit2marshal.h \
@@ -23017,8 +23027,8 @@
 	$(top_builddir)/Programs/MiniBrowser \
 	$(minibrowser_built_sources) \
 	$(top_builddir)/stamp-mini-browser-marshal.h \
-	$(top_builddir)/stamp-mini-browser-marshal.c $(am__append_82) \
-	$(am__append_85)
+	$(top_builddir)/stamp-mini-browser-marshal.c $(am__append_84) \
+	$(am__append_87)
 DOMAIN := $(GETTEXT_PACKAGE)
 DISTCLEANFILES := $(top_builddir)/Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc \
 	$(ALL_MOFILES) \
@@ -23028,7 +23038,7 @@
 	$(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml \
 	$(top_builddir)/Source/WebKit/gtk/webkit/webkitversion.h \
 	$(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc \
-	$(top_builddir)/libWebCoreLayerGtk2.a $(am__append_95) \
+	$(top_builddir)/libWebCoreLayerGtk2.a $(am__append_97) \
 	$(CLEANFILES) $(builddir)/doltcompile $(builddir)/doltlibtool \
 	$(builddir)/WebKitFeatures.h $(builddir)/WebKitFeatures.txt
 MAINTAINERCLEANFILES := $(ALL_MOFILES) \
@@ -23042,7 +23052,7 @@
 	$(srcdir)/GNUmakefile.in $(srcdir)/INSTALL $(srcdir)/README \
 	$(top_builddir)/config.*
 pkgconfig_DATA := Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc \
-	$(am__append_40) $(am__append_58)
+	$(am__append_42) $(am__append_60)
 gdom_symbol_files := $(patsubst %.h,%.symbols, $(filter \
 	DerivedSources/webkitdom/WebKitDOM%.h, \
 	$(webkitgtk_gdom_built_h_api)))
@@ -23057,9 +23067,9 @@
 	$(shell ls \
 	$(WebInspectorUI)/UserInterface/External/CodeMirror/*.css)
 @ENABLE_INTROSPECTION_TRUE@gir_DATA := JavaScriptCore-@WEBKITGTK_API_VERSION@.gir \
-@ENABLE_INTROSPECTION_TRUE@	$(am__append_41) $(am__append_59)
+@ENABLE_INTROSPECTION_TRUE@	$(am__append_43) $(am__append_61)
 @ENABLE_INTROSPECTION_TRUE@typelibs_DATA := JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib \
-@ENABLE_INTROSPECTION_TRUE@	$(am__append_42) $(am__append_60)
+@ENABLE_INTROSPECTION_TRUE@	$(am__append_44) $(am__append_62)
 @ENABLE_INTROSPECTION_TRUE@girdir := $(datadir)/gir-1.0
 @ENABLE_INTROSPECTION_TRUE@typelibsdir := $(libdir)/girepository-1.0
 webkit1_pkg_config_file = Source/WebKit/gtk/webkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.pc
@@ -23214,11 +23224,9 @@
 	$(GLOBALDEPS_CFLAGS) \
 	$(UNICODE_CFLAGS)
 
-Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD = \
-	-lpthread \
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD = -lpthread \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-	$(WINMM_LIBS)
-
+	$(WINMM_LIBS) $(am__append_5)
 
 # Inspector Interfaces
 JavaScriptCore_INSPECTOR_DOMAINS := \
@@ -23286,9 +23294,9 @@
 	$(LIBSOUP_CFLAGS)
 
 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in \
-	$(am__append_23)
+	$(am__append_25)
 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in \
-	$(am__append_24)
+	$(am__append_26)
 
 # ----
 # SVG Support
@@ -23635,8 +23643,8 @@
 MSGMERGE := $(shell which msgmerge)
 MSGMERGE_UPDATE := $(MSGMERGE) --update
 docs_build_dependencies =  \
-	Source/WebKit/gtk/docs/webkitenvironment.xml $(am__append_31) \
-	$(am__append_32) libGObjectDOMBindings.la gtkdoc-webkitdom.cfg
+	Source/WebKit/gtk/docs/webkitenvironment.xml $(am__append_33) \
+	$(am__append_34) libGObjectDOMBindings.la gtkdoc-webkitdom.cfg
 nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
 	$(webkitgtk_built_sources)
 
@@ -23702,12 +23710,12 @@
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS :=  \
 	-version-info @LIBWEBKITGTK_VERSION@ $(no_undefined) \
-	$(am__append_36)
+	$(am__append_38)
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD :=  \
 	-lpthread libPlatform.la libPlatformGtk.la libWebCore.la \
 	libWebCorePlatform.la libWebCoreModules.la \
-	libGObjectDOMBindings.la libWebCoreGtk.la $(am__append_37) \
-	$(am__append_38) $(am__append_39) \
+	libGObjectDOMBindings.la libWebCoreGtk.la $(am__append_39) \
+	$(am__append_40) $(am__append_41) \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 	$(CAIRO_LIBS) $(COVERAGE_LDFLAGS) $(ENCHANT_LIBS) \
 	$(FREETYPE_LIBS) $(GAMEPAD_LIBS) $(GEOCLUE_LIBS) $(GLIB_LIBS) \
@@ -23949,11 +23957,11 @@
 
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS :=  \
 	-version-info @LIBWEBKIT2GTK_VERSION@ $(no_undefined) \
-	$(am__append_54)
+	$(am__append_56)
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD :=  \
 	-lpthread libWebCore.la libWebCorePlatform.la \
-	libWebCoreModules.la $(am__append_55) $(am__append_56) \
-	$(am__append_57) \
+	libWebCoreModules.la $(am__append_57) $(am__append_58) \
+	$(am__append_59) \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 	libPlatform.la libPlatformGtk.la libGObjectDOMBindings.la \
 	libWebCoreGtk.la libWebKit2Platform.la $(CAIRO_LIBS) \
@@ -24127,11 +24135,11 @@
 # Serialize linking of the plugin process with both webkit libraries.
 plugin_process_for_dep = Programs/WebKitPluginProcess
 plugin_process_for_dep_list = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-	$(am__append_62)
+	$(am__append_64)
 webcore_layer_gtk2_deps = libPlatform.la libPlatformGtk2.la \
 	libWebCorePlatform.la libWebCoreGtk2.la libWebCore.la \
-	libWebCoreModules.la $(am__append_63) $(am__append_64) \
-	$(am__append_65)
+	libWebCoreModules.la $(am__append_65) $(am__append_66) \
+	$(am__append_67)
 webcore_layer_gtk2_archives = $(foreach lib, $(webcore_layer_gtk2_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
 Programs_WebKitPluginProcess_CPPFLAGS = \
 	-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
@@ -24428,8 +24436,8 @@
 libLevelDB_la_CPPFLAGS = $(global_cppflags) -fno-builtin-memcmp \
 	-I$(srcdir)/Source/ThirdParty/leveldb \
 	-I$(srcdir)/Source/ThirdParty/leveldb/include \
-	-DLEVELDB_PLATFORM_POSIX $(am__append_70) $(am__append_71) \
-	$(am__append_72) $(am__append_73) $(am__append_74)
+	-DLEVELDB_PLATFORM_POSIX $(am__append_72) $(am__append_73) \
+	$(am__append_74) $(am__append_75) $(am__append_76)
 libLevelDB_la_SOURCES = \
 	Source/ThirdParty/leveldb/db/builder.cc\
 	Source/ThirdParty/leveldb/db/builder.h \
@@ -24617,7 +24625,7 @@
 @ENABLE_DEVELOPER_MODE_TRUE@	$(platform_cppflags) \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(platformgtk_cppflags) \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(webcore_cppflags) \
-@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_81)
+@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_83)
 @ENABLE_DEVELOPER_MODE_TRUE@Programs_DumpRenderTree_SOURCES = \
 @ENABLE_DEVELOPER_MODE_TRUE@	Source/WebCore/platform/gtk/GtkVersioning.c \
 @ENABLE_DEVELOPER_MODE_TRUE@	Tools/DumpRenderTree/DumpRenderTree.h \
@@ -24730,7 +24738,7 @@
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	$(global_cppflags) \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	$(javascriptcore_cppflags) \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	-Wno-missing-format-attribute \
-@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	$(am__append_84) \
+@ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	$(am__append_86) \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	-DMOZ_X11
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@TestNetscapePlugin_libTestNetscapePlugin_la_SOURCES = \
 @ENABLE_DEVELOPER_MODE_TRUE@@TARGET_X11_TRUE@	Tools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \
@@ -24943,8 +24951,8 @@
 @ENABLE_DEVELOPER_MODE_TRUE@	libWebCorePlatform.la \
 @ENABLE_DEVELOPER_MODE_TRUE@	libWebCoreGtk.la libWebCore.la \
 @ENABLE_DEVELOPER_MODE_TRUE@	libWebCoreModules.la \
-@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_92) $(am__append_93) \
-@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_94)
+@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_94) $(am__append_95) \
+@ENABLE_DEVELOPER_MODE_TRUE@	$(am__append_96)
 @ENABLE_DEVELOPER_MODE_TRUE@webcore_layer_archives = $(foreach lib, $(webcore_layer_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
 @ENABLE_DEVELOPER_MODE_TRUE@Programs_TestWebKitAPI_WebCore_TestWebCore_CPPFLAGS = \
 @ENABLE_DEVELOPER_MODE_TRUE@	$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
diff -Nru webkitgtk-2.4.7/NEWS webkitgtk-2.4.8/NEWS
--- webkitgtk-2.4.7/NEWS	2014-10-22 14:21:04.000000000 +0300
+++ webkitgtk-2.4.8/NEWS	2015-01-07 12:14:30.000000000 +0200
@@ -1,4 +1,16 @@
 =================
+WebKitGTK+  2.4.8
+=================
+
+  - Fix SSL connection issues with some websites after the POODLE vulnerability fix.
+  - Fix a crash when loading flash plugins.
+  - Fix build on GNU Hurd
+  - Fix build on OS X.
+  - Fix documentation of webkit_print_operation_get_page_setup().
+  - Security fixes: CVE-2014-1344, CVE-2014-1384, CVE-2014-1385, CVE-2014-1386,
+    CVE-2014-1387, CVE-2014-1388, CVE-2014-1389, CVE-2014-1390.
+
+=================
 WebKitGTK+  2.4.7
 =================
 
diff -Nru webkitgtk-2.4.7/Source/autotools/Versions.m4 webkitgtk-2.4.8/Source/autotools/Versions.m4
--- webkitgtk-2.4.7/Source/autotools/Versions.m4	2014-10-22 13:37:40.000000000 +0300
+++ webkitgtk-2.4.8/Source/autotools/Versions.m4	2015-01-07 11:46:38.000000000 +0200
@@ -1,6 +1,6 @@
 m4_define([webkit_major_version], [2])
 m4_define([webkit_minor_version], [4])
-m4_define([webkit_micro_version], [7])
+m4_define([webkit_micro_version], [8])
 
 # This is the version we'll be using as part of our User-Agent string,
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -11,9 +11,9 @@
 
 # Libtool library version, not to confuse with API version.
 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-m4_define([libwebkitgtk_version], [22:13:22])
-m4_define([libjavascriptcoregtk_version], [16:15:16])
-m4_define([libwebkit2gtk_version], [35:10:10])
+m4_define([libwebkitgtk_version], [22:14:22])
+m4_define([libjavascriptcoregtk_version], [16:16:16])
+m4_define([libwebkit2gtk_version], [35:11:10])
 
 m4_define([gtk2_required_version], [2.24.10])
 m4_define([gtk3_required_version], [3.6.0])
diff -Nru webkitgtk-2.4.7/Source/JavaScriptCore/ChangeLog webkitgtk-2.4.8/Source/JavaScriptCore/ChangeLog
--- webkitgtk-2.4.7/Source/JavaScriptCore/ChangeLog	2014-10-22 11:16:08.000000000 +0300
+++ webkitgtk-2.4.8/Source/JavaScriptCore/ChangeLog	2015-01-07 11:45:42.000000000 +0200
@@ -1,3 +1,19 @@
+2014-10-06  Philip Chimento  <philip.chimento@gmail.com>
+
+        webkit-gtk fails to link JavaScriptCore, missing symbols add_history and readline
+        https://bugs.webkit.org/show_bug.cgi?id=127059
+
+        Reviewed by Carlos Garcia Campos.
+
+        * GNUmakefile.am: add -ledit to jsc link args on OS_DARWIN.
+
+2014-04-15  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, add the obvious thing that marks MakeRope as exiting since it can exit.
+
+        * dfg/DFGAbstractInterpreterInlines.h:
+        (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+
 2014-08-18  Diego Pino Garcia  <dpino@igalia.com>
 
         Completed iterator can be revived by adding more than one new entry to the target object
diff -Nru webkitgtk-2.4.7/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h webkitgtk-2.4.8/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
--- webkitgtk-2.4.7/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h	2015-01-07 11:45:42.000000000 +0200
@@ -400,6 +400,7 @@
     }
         
     case MakeRope: {
+        node->setCanExit(true);
         forNode(node).set(m_graph, m_graph.m_vm.stringStructure.get());
         break;
     }
diff -Nru webkitgtk-2.4.7/Source/JavaScriptCore/GNUmakefile.am webkitgtk-2.4.8/Source/JavaScriptCore/GNUmakefile.am
--- webkitgtk-2.4.7/Source/JavaScriptCore/GNUmakefile.am	2014-10-22 11:16:08.000000000 +0300
+++ webkitgtk-2.4.8/Source/JavaScriptCore/GNUmakefile.am	2015-01-07 11:45:42.000000000 +0200
@@ -193,6 +193,10 @@
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
 	$(WINMM_LIBS)
 
+if OS_DARWIN
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD += -ledit
+endif
+
 EXTRA_DIST += \
 	Source/JavaScriptCore/AUTHORS \
 	Source/JavaScriptCore/ChangeLog \
diff -Nru webkitgtk-2.4.7/Source/WebCore/accessibility/AccessibilityObject.cpp webkitgtk-2.4.8/Source/WebCore/accessibility/AccessibilityObject.cpp
--- webkitgtk-2.4.7/Source/WebCore/accessibility/AccessibilityObject.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/accessibility/AccessibilityObject.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -1224,8 +1224,10 @@
 void AccessibilityObject::updateBackingStore()
 {
     // Updating the layout may delete this object.
-    if (Document* document = this->document())
-        document->updateLayoutIgnorePendingStylesheets();
+    if (Document* document = this->document()) {
+        if (!document->view()->isInLayout())
+            document->updateLayoutIgnorePendingStylesheets();
+    }
 }
 #endif
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/accessibility/AXObjectCache.cpp webkitgtk-2.4.8/Source/WebCore/accessibility/AXObjectCache.cpp
--- webkitgtk-2.4.7/Source/WebCore/accessibility/AXObjectCache.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/accessibility/AXObjectCache.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -394,7 +394,11 @@
     newObj->init();
     attachWrapper(newObj.get());
     newObj->setLastKnownIsIgnoredValue(newObj->accessibilityIsIgnored());
-
+    // Sometimes asking accessibilityIsIgnored() will cause the newObject to be deallocated, and then
+    // it will disappear when this function is finished, leading to a use-after-free.
+    if (newObj->isDetached())
+        return nullptr;
+    
     return newObj.get();
 }
 
@@ -418,7 +422,11 @@
     newObj->init();
     attachWrapper(newObj.get());
     newObj->setLastKnownIsIgnoredValue(newObj->accessibilityIsIgnored());
-
+    // Sometimes asking accessibilityIsIgnored() will cause the newObject to be deallocated, and then
+    // it will disappear when this function is finished, leading to a use-after-free.
+    if (newObj->isDetached())
+        return nullptr;
+    
     return newObj.get();
 }
     
diff -Nru webkitgtk-2.4.7/Source/WebCore/ChangeLog webkitgtk-2.4.8/Source/WebCore/ChangeLog
--- webkitgtk-2.4.7/Source/WebCore/ChangeLog	2014-10-22 13:18:37.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/ChangeLog	2015-01-07 11:45:42.000000000 +0200
@@ -1,3 +1,198 @@
+2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Crash in WebCore::Node::getFlag
+        https://bugs.webkit.org/show_bug.cgi?id=137961
+
+        Reviewed by Antti Koivisto.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyBlockStyle): Null pointer check added.
+
+2014-11-11  David Kilzer  <ddkilzer@apple.com>
+
+        Protect Document in ProcessingInstruction::setXSLStyleSheet()
+        <http://webkit.org/b/138621>
+
+        Reviewed by Andreas Kling.
+
+        The patch is inspired by the following Blink revision by
+        <tasak@google.com>:
+        <https://src.chromium.org/viewvc/blink?view=rev&revision=182309>
+
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::setXSLStyleSheet):
+
+2014-12-08  Doron Wloschowsky  <doron_wloschowsky@scee.net>
+
+        Webkit using Harfbuzz does not display Arabic script correctly
+        https://bugs.webkit.org/show_bug.cgi?id=136337
+
+        Reviewed by Carlos Garcia Campos.
+
+        Using reinterpret_cast to convert hb_codepoint_t* into UChar*
+        doesn't work on big endian systems.
+
+        * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
+        (WebCore::harfBuzzGetGlyph):
+
+2014-04-25  Miyoung Shin  <myid.shin@samsung.com>
+
+        Web process is crashed during dispatching touchEvent created by JS.
+        https://bugs.webkit.org/show_bug.cgi?id=113225
+
+        Reviewed by Benjamin Poulain.
+
+        TouchEvent created by JS should have the necessary attributes
+        of touches, targetTouches and changedTouches.
+        It should be verified weather there are touchLists before dispatching touch event.
+
+        Test: fast/events/touch/create-touch-event-without-touchList.html
+
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchEvent):
+        (WebCore::EventPath::updateTouchLists):
+        (WebCore::addRelatedNodeResolversForTouchList): Deleted.
+
+2014-07-08  Jeffrey Pfau  <jpfau@apple.com>
+
+        Fix flaky loading tests
+        https://bugs.webkit.org/show_bug.cgi?id=133696
+
+        Reviewed by Ryosuke Niwa.
+
+        In some cases, the Frame may be destroyed while the loader is
+        initializing. Make sure we don't delete it too early.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::init):
+
+2014-06-11  Jeffrey Pfau  <jpfau@apple.com>
+
+        Fix flaky beforeload tests
+        https://bugs.webkit.org/show_bug.cgi?id=133685
+
+        Reviewed by David Kilzer.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURL):
+
+2014-06-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Safari crashed once in WebCore::AccessibilityObject::ariaIsHidden
+        https://bugs.webkit.org/show_bug.cgi?id=133825
+
+        Reviewed by Enrica Casucci.
+
+        Sometimes asking accessibilityIsIgnored() will cause a newObject to be detached immediately after its created. 
+        The creation function holds a reference with RefPtr as long as it lives, but when that method returns, the object goes away.
+
+        With that out of the way, I saw the same backtrace lead to updateLayoutIgnorePendingStylesheets being called while still inLayout.
+
+        I tried my best but could not create a reproducible layout test.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::getOrCreate):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::updateBackingStore):
+
+2014-06-16  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Crash at WebCore::AXObjectCache::textChanged
+        https://bugs.webkit.org/show_bug.cgi?id=133873
+
+        Reviewed by Enrica Casucci.
+
+        This looks like a very similar problem to 
+        https://bugs.webkit.org/show_bug.cgi?id=133825
+
+        The object is being created and deallocated almost right away because calling accessibilityIsIgnored triggers
+        a deferred layout that invalidates the associated render element.
+
+        Despite my best efforts, I could not come up with a way to reproduce this in a layout test.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::getOrCreate):
+
+2014-06-09  Alexey Proskuryakov  <ap@apple.com>
+
+        Properly reset UStringSearch object in SearchBuffer constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=133662
+        <rdar://problem/17240136>
+
+        Reviewed by Tim Horton.
+
+        * editing/TextIterator.cpp: (WebCore::SearchBuffer::~SearchBuffer):
+
+2014-05-28  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Roll r168668 back in.
+
+        <https://bugs.webkit.org/show_bug.cgi?id=132621>
+
+        Reviewed by Brent Fulgham.
+
+        Tests: fast/events/beforeload-assertion.html
+               fast/events/beforeload-iframe-crash.html
+               fast/events/beforeload-input-time-crash.html
+
+        * WebCore.exp.in:
+        * dom/Document.cpp:
+        (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+        * dom/Document.h:
+        * html/HTMLAppletElement.cpp:
+        (WebCore::HTMLAppletElement::renderWidgetForJSBindings):
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::renderWidgetForJSBindings):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::renderWidgetForJSBindings):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::updateEmbeddedObjectsTimerFired):
+        (WebCore::FrameView::flushAnyPendingPostLayoutTasks):
+        (WebCore::FrameView::performPostLayoutTasks):
+        * page/FrameView.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
+2014-10-06  Philip Chimento  <philip.chimento@gmail.com>
+
+        webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=126821
+
+        Reviewed by Carlos Garcia Campos.
+
+        * plugins/PluginPackageNone.cpp: Remove PluginPackage::determineQuirks()
+        from PluginPackageNone.cpp as it also shows up as a duplicate symbol.
+
+2014-10-06  Philip Chimento  <philip.chimento@gmail.com>
+
+        webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=126821
+
+        Reviewed by Carlos Garcia Campos.
+
+        * GNUmakefile.list.am: Add WidgetBackingStoreCairo to platformgtk_sources
+        for the Quartz build target, otherwise WebKitGTK aborts with an undefined
+        symbol at runtime.
+
+2015-01-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=126821
+
+        Reviewed by Carlos Garcia Campos.
+
+        * GNUmakefile.list.am: Simplify the logic for determining build
+        targets that are specific to windowing targets. Avoid nested target
+        checks and list all the additional build targets for each windowing
+        target - X11, Wayland, X11 and Wayland (i.e. the build targets that
+        are shared between the two configurations), Win32 and Quartz. This
+        avoids the current problems of building duplicate build targets on
+        Quartz, and also cleans up the list.
+
 2014-10-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [SOUP] TLS errors should take precedence over HTTP authentication
diff -Nru webkitgtk-2.4.7/Source/WebCore/dom/Document.cpp webkitgtk-2.4.8/Source/WebCore/dom/Document.cpp
--- webkitgtk-2.4.7/Source/WebCore/dom/Document.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/dom/Document.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -1836,10 +1836,10 @@
 // stylesheets are loaded. Doing a layout ignoring the pending stylesheets
 // lets us get reasonable answers. The long term solution to this problem is
 // to instead suspend JavaScript execution.
-void Document::updateLayoutIgnorePendingStylesheets()
+void Document::updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks runPostLayoutTasks)
 {
     bool oldIgnore = m_ignorePendingStylesheets;
-    
+
     if (!haveStylesheetsLoaded()) {
         m_ignorePendingStylesheets = true;
         // FIXME: We are willing to attempt to suppress painting with outdated style info only once.  Our assumption is that it would be
@@ -1861,6 +1861,9 @@
 
     updateLayout();
 
+    if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())
+        view()->flushAnyPendingPostLayoutTasks();
+
     m_ignorePendingStylesheets = oldIgnore;
 }
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/dom/Document.h webkitgtk-2.4.8/Source/WebCore/dom/Document.h
--- webkitgtk-2.4.7/Source/WebCore/dom/Document.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/dom/Document.h	2015-01-07 11:45:42.000000000 +0200
@@ -547,7 +547,11 @@
     void recalcStyle(Style::Change = Style::NoChange);
     void updateStyleIfNeeded();
     void updateLayout();
-    void updateLayoutIgnorePendingStylesheets();
+    enum RunPostLayoutTasks {
+        RunPostLayoutTasksAsynchronously,
+        RunPostLayoutTasksSynchronously,
+    };
+    void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasksAsynchronously);
     PassRef<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*);
 
     // Returns true if page box (margin boxes and page borders) is visible.
diff -Nru webkitgtk-2.4.7/Source/WebCore/dom/EventDispatcher.cpp webkitgtk-2.4.8/Source/WebCore/dom/EventDispatcher.cpp
--- webkitgtk-2.4.7/Source/WebCore/dom/EventDispatcher.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/dom/EventDispatcher.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -91,7 +91,7 @@
     EventContext& contextAt(size_t i) { return *m_path[i]; }
 
 #if ENABLE(TOUCH_EVENTS)
-    void updateTouchLists(const TouchEvent&);
+    bool updateTouchLists(const TouchEvent&);
 #endif
     void setRelatedTarget(EventTarget&);
 
@@ -312,8 +312,10 @@
     if (EventTarget* relatedTarget = event->relatedTarget())
         eventPath.setRelatedTarget(*relatedTarget);
 #if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
-    if (event->isTouchEvent())
-        eventPath.updateTouchLists(*toTouchEvent(event.get()));
+    if (event->isTouchEvent()) {
+        if (!eventPath.updateTouchLists(*toTouchEvent(event.get())))
+            return true;
+    }
 #endif
 
     ChildNodesLazySnapshot::takeChildNodesLazySnapshot();
@@ -432,8 +434,11 @@
         touchTargetResolvers.append(EventRelatedNodeResolver(*touchList->item(i), type));
 }
 
-void EventPath::updateTouchLists(const TouchEvent& touchEvent)
+bool EventPath::updateTouchLists(const TouchEvent& touchEvent)
 {
+    if (!touchEvent.touches() || !touchEvent.targetTouches() || !touchEvent.changedTouches())
+        return false;
+    
     Vector<EventRelatedNodeResolver, 16> touchTargetResolvers;
     const size_t touchNodeCount = touchEvent.touches()->length() + touchEvent.targetTouches()->length() + touchEvent.changedTouches()->length();
     touchTargetResolvers.reserveInitialCapacity(touchNodeCount);
@@ -454,6 +459,7 @@
             context.touchList(currentResolver.touchListType())->append(currentResolver.touch()->cloneWithNewTarget(nodeInCurrentTreeScope));
         }
     }
+    return true;
 }
 #endif
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/dom/ProcessingInstruction.cpp webkitgtk-2.4.8/Source/WebCore/dom/ProcessingInstruction.cpp
--- webkitgtk-2.4.7/Source/WebCore/dom/ProcessingInstruction.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/dom/ProcessingInstruction.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -215,6 +215,7 @@
 {
     ASSERT(m_isXSL);
     m_sheet = XSLStyleSheet::create(this, href, baseURL);
+    Ref<Document> protect(document());
     parseStyleSheet(sheet);
 }
 #endif
diff -Nru webkitgtk-2.4.7/Source/WebCore/editing/ApplyStyleCommand.cpp webkitgtk-2.4.8/Source/WebCore/editing/ApplyStyleCommand.cpp
--- webkitgtk-2.4.7/Source/WebCore/editing/ApplyStyleCommand.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/editing/ApplyStyleCommand.cpp	2015-01-07 11:45:42.000000000 +0200
@@ -267,6 +267,9 @@
 #else
     Node* scope = highestEditableRoot(visibleStart.deepEquivalent());
 #endif
+    if (!scope)
+        return;
+
     RefPtr<Range> startRange = Range::create(document(), firstPositionInNode(scope), visibleStart.deepEquivalent().parentAnchoredEquivalent());
     RefPtr<Range> endRange = Range::create(document(), firstPositionInNode(scope), visibleEnd.deepEquivalent().parentAnchoredEquivalent());
     int startIndex = TextIterator::rangeLength(startRange.get(), true);
diff -Nru webkitgtk-2.4.7/Source/WebCore/editing/TextIterator.cpp webkitgtk-2.4.8/Source/WebCore/editing/TextIterator.cpp
--- webkitgtk-2.4.7/Source/WebCore/editing/TextIterator.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/editing/TextIterator.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -2058,6 +2058,8 @@
     UErrorCode status = U_ZERO_ERROR;
     usearch_setPattern(WebCore::searcher(), &newlineCharacter, 1, &status);
     ASSERT(status == U_ZERO_ERROR);
+    usearch_setText(WebCore::searcher(), &newlineCharacter, 1, &status);
+    ASSERT(status == U_ZERO_ERROR);
 
     unlockSearcher();
 }
diff -Nru webkitgtk-2.4.7/Source/WebCore/GNUmakefile.list.am webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am
--- webkitgtk-2.4.7/Source/WebCore/GNUmakefile.list.am	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am	2015-01-07 11:45:42.000000000 +0200
@@ -6251,11 +6251,13 @@
 	Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
 	Source/WebCore/platform/graphics/glx/GLContextGLX.h
 endif # END USE_GLX
-else
+endif # END TARGET_X11
+
+if TARGET_WAYLAND
 webcore_sources += \
 	Source/WebCore/plugins/PluginPackageNone.cpp \
 	Source/WebCore/plugins/PluginViewNone.cpp
-endif # END TARGET_X11
+endif # END TARGET_WAYLAND
 
 if TARGET_X11_OR_WAYLAND
 platformgtk_sources += \
@@ -6273,7 +6275,8 @@
 	Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
 	Source/WebCore/platform/graphics/egl/GLContextEGL.h
 endif # END USE_EGL
-else
+endif # END TARGET_X11_OR_WAYLAND
+
 if TARGET_WIN32
 webcore_sources += \
 	Source/WebCore/platform/graphics/win/DIBPixelData.cpp \
@@ -6299,12 +6302,16 @@
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
 	Source/WebCore/plugins/win/PluginViewWin.cpp
-else
+endif # END TARGET_WIN32
+
+if TARGET_QUARTZ
 webcore_sources += \
 	Source/WebCore/plugins/PluginPackageNone.cpp \
 	Source/WebCore/plugins/PluginViewNone.cpp
-endif # END TARGET_WIN32
-endif # END TARGET_X11_OR_WAYLAND
+platformgtk_sources += \
+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
+endif # END TARGET_QUARTZ
 
 if USE_GLES2
 webcore_sources += \
diff -Nru webkitgtk-2.4.7/Source/WebCore/html/HTMLAppletElement.cpp webkitgtk-2.4.8/Source/WebCore/html/HTMLAppletElement.cpp
--- webkitgtk-2.4.7/Source/WebCore/html/HTMLAppletElement.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/html/HTMLAppletElement.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -88,7 +88,10 @@
     if (!canEmbedJava())
         return 0;
 
-    document().updateLayoutIgnorePendingStylesheets();
+    // Needs to load the plugin immediatedly because this function is called
+    // when JavaScript code accesses the plugin.
+    // FIXME: <rdar://16893708> Check if dispatching events here is safe.
+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
     return renderWidget();
 }
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/html/HTMLEmbedElement.cpp webkitgtk-2.4.8/Source/WebCore/html/HTMLEmbedElement.cpp
--- webkitgtk-2.4.7/Source/WebCore/html/HTMLEmbedElement.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/html/HTMLEmbedElement.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -71,8 +71,12 @@
 RenderWidget* HTMLEmbedElement::renderWidgetForJSBindings() const
 {
     FrameView* view = document().view();
-    if (!view || (!view->isInLayout() && !view->isPainting()))
-        document().updateLayoutIgnorePendingStylesheets();
+    if (!view || (!view->isInLayout() && !view->isPainting())) {
+        // Needs to load the plugin immediatedly because this function is called
+        // when JavaScript code accesses the plugin.
+        // FIXME: <rdar://16893708> Check if dispatching events here is safe.
+        document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+    }
     return findWidgetRenderer(this);
 }
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/html/HTMLObjectElement.cpp webkitgtk-2.4.8/Source/WebCore/html/HTMLObjectElement.cpp
--- webkitgtk-2.4.7/Source/WebCore/html/HTMLObjectElement.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/html/HTMLObjectElement.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -83,7 +83,10 @@
 
 RenderWidget* HTMLObjectElement::renderWidgetForJSBindings() const
 {
-    document().updateLayoutIgnorePendingStylesheets();
+    // Needs to load the plugin immediatedly because this function is called
+    // when JavaScript code accesses the plugin.
+    // FIXME: <rdar://16893708> Check if dispatching events here is safe.
+    document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
     return renderWidget(); // This will return 0 if the renderer is not a RenderWidget.
 }
 
diff -Nru webkitgtk-2.4.7/Source/WebCore/loader/FrameLoader.cpp webkitgtk-2.4.8/Source/WebCore/loader/FrameLoader.cpp
--- webkitgtk-2.4.7/Source/WebCore/loader/FrameLoader.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/loader/FrameLoader.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -274,6 +274,8 @@
     setPolicyDocumentLoader(m_client.createDocumentLoader(ResourceRequest(URL(ParsedURLString, emptyString())), SubstituteData()).get());
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     m_provisionalDocumentLoader->startLoadingMainResource();
+
+    Ref<Frame> protect(m_frame);
     m_frame.document()->cancelParsing();
     m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
 
@@ -1254,6 +1256,8 @@
     if (m_inStopAllLoaders)
         return;
 
+    Ref<Frame> protect(m_frame);
+
     RefPtr<FormState> formState = prpFormState;
     bool isFormSubmission = formState;
     
diff -Nru webkitgtk-2.4.7/Source/WebCore/page/FrameView.cpp webkitgtk-2.4.8/Source/WebCore/page/FrameView.cpp
--- webkitgtk-2.4.7/Source/WebCore/page/FrameView.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/page/FrameView.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -168,6 +168,7 @@
     , m_layoutPhase(OutsideLayout)
     , m_inSynchronousPostLayout(false)
     , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired)
+    , m_updateEmbeddedObjectsTimer(this, &FrameView::updateEmbeddedObjectsTimerFired)
     , m_isTransparent(false)
     , m_baseBackgroundColor(Color::white)
     , m_mediaType("screen")
@@ -256,6 +257,7 @@
     m_layoutCount = 0;
     m_nestedLayoutCount = 0;
     m_postLayoutTasksTimer.stop();
+    m_updateEmbeddedObjectsTimer.stop();
     m_firstLayout = true;
     m_firstLayoutCallbackPending = false;
     m_wasScrolledByUser = false;
@@ -2640,16 +2642,28 @@
     return m_embeddedObjectsToUpdate->isEmpty();
 }
 
-void FrameView::flushAnyPendingPostLayoutTasks()
+void FrameView::updateEmbeddedObjectsTimerFired(Timer<FrameView>*)
 {
-    if (!m_postLayoutTasksTimer.isActive())
-        return;
+    RefPtr<FrameView> protect(this);
+    m_updateEmbeddedObjectsTimer.stop();
+    for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) {
+        if (updateEmbeddedObjects())
+            break;
+    }
+}
 
-    performPostLayoutTasks();
+void FrameView::flushAnyPendingPostLayoutTasks()
+{
+    if (m_postLayoutTasksTimer.isActive())
+        performPostLayoutTasks();
+    if (m_updateEmbeddedObjectsTimer.isActive())
+        updateEmbeddedObjectsTimerFired(nullptr);
 }
 
 void FrameView::performPostLayoutTasks()
 {
+    // FIXME: We should not run any JavaScript code in this function.
+
     m_postLayoutTasksTimer.stop();
 
     frame().selection().setCaretRectNeedsUpdate();
@@ -2706,10 +2720,7 @@
     // is called through the post layout timer.
     Ref<FrameView> protect(*this);
 
-    for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) {
-        if (updateEmbeddedObjects())
-            break;
-    }
+    m_updateEmbeddedObjectsTimer.startOneShot(0);
 
     if (page) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
diff -Nru webkitgtk-2.4.7/Source/WebCore/page/FrameView.h webkitgtk-2.4.8/Source/WebCore/page/FrameView.h
--- webkitgtk-2.4.7/Source/WebCore/page/FrameView.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/page/FrameView.h	2015-01-07 11:45:43.000000000 +0200
@@ -540,6 +540,7 @@
     void enableSpeculativeTilingIfNeeded();
     void speculativeTilingEnableTimerFired(Timer<FrameView>&);
 
+    void updateEmbeddedObjectsTimerFired(Timer<FrameView>*);
     bool updateEmbeddedObjects();
     void updateEmbeddedObject(RenderEmbeddedObject&);
     void scrollToAnchor();
@@ -594,6 +595,7 @@
     int m_layoutCount;
     unsigned m_nestedLayoutCount;
     Timer<FrameView> m_postLayoutTasksTimer;
+    Timer<FrameView> m_updateEmbeddedObjectsTimer;
     bool m_firstLayoutCallbackPending;
 
     bool m_firstLayout;
diff -Nru webkitgtk-2.4.7/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp webkitgtk-2.4.8/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
--- webkitgtk-2.4.7/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -112,7 +112,8 @@
     if (result.isNewEntry) {
         cairo_glyph_t* glyphs = 0;
         int numGlyphs = 0;
-        CString utf8Codepoint = UTF8Encoding().encode(reinterpret_cast<UChar*>(&unicode), 1, QuestionMarksForUnencodables);
+        UChar ch = unicode;
+        CString utf8Codepoint = UTF8Encoding().encode(&ch, 1, QuestionMarksForUnencodables);
         if (cairo_scaled_font_text_to_glyphs(scaledFont, 0, 0, utf8Codepoint.data(), utf8Codepoint.length(), &glyphs, &numGlyphs, 0, 0, 0) != CAIRO_STATUS_SUCCESS)
             return false;
         if (!numGlyphs)
diff -Nru webkitgtk-2.4.7/Source/WebCore/plugins/PluginPackageNone.cpp webkitgtk-2.4.8/Source/WebCore/plugins/PluginPackageNone.cpp
--- webkitgtk-2.4.7/Source/WebCore/plugins/PluginPackageNone.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/plugins/PluginPackageNone.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -28,10 +28,6 @@
 
 namespace WebCore {
 
-void PluginPackage::determineQuirks(const String&)
-{
-}
-
 bool PluginPackage::fetchInfo()
 {
     return false;
diff -Nru webkitgtk-2.4.7/Source/WebCore/testing/Internals.cpp webkitgtk-2.4.8/Source/WebCore/testing/Internals.cpp
--- webkitgtk-2.4.7/Source/WebCore/testing/Internals.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/testing/Internals.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -50,6 +50,7 @@
 #include "FormController.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
+#include "HTMLIFrameElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "HTMLSelectElement.h"
@@ -1870,6 +1871,28 @@
     frameView->setTracksRepaints(false);
 }
 
+void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode& ec)
+{
+    updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(nullptr, ec);
+}
+
+void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node* node, ExceptionCode& ec)
+{
+    Document* document;
+    if (!node)
+        document = contextDocument();
+    else if (node->isDocumentNode())
+        document = toDocument(node);
+    else if (node->hasTagName(HTMLNames::iframeTag))
+        document = toHTMLIFrameElement(node)->contentDocument();
+    else {
+        ec = TypeError;
+        return;
+    }
+
+    document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
+}
+
 #if !PLATFORM(IOS)
 static const char* cursorTypeToString(Cursor::Type cursorType)
 {
diff -Nru webkitgtk-2.4.7/Source/WebCore/testing/Internals.h webkitgtk-2.4.8/Source/WebCore/testing/Internals.h
--- webkitgtk-2.4.7/Source/WebCore/testing/Internals.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/testing/Internals.h	2015-01-07 11:45:43.000000000 +0200
@@ -270,6 +270,8 @@
 
     void startTrackingRepaints(ExceptionCode&);
     void stopTrackingRepaints(ExceptionCode&);
+    void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode&);
+    void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionCode&);
 
     PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
     PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
diff -Nru webkitgtk-2.4.7/Source/WebCore/testing/Internals.idl webkitgtk-2.4.8/Source/WebCore/testing/Internals.idl
--- webkitgtk-2.4.7/Source/WebCore/testing/Internals.idl	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebCore/testing/Internals.idl	2015-01-07 11:45:43.000000000 +0200
@@ -231,6 +231,11 @@
     [RaisesException] void startTrackingRepaints();
     [RaisesException] void stopTrackingRepaints();
 
+    // |node| should be Document, HTMLIFrameElement, or unspecified.
+    // If |node| is an HTMLIFrameElement, it assumes node.contentDocument is
+    // specified without security checks. Unspecified means this document.
+    [RaisesException] void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(optional Node node);
+
     // Returns a string with information about the mouse cursor used at the specified client location.
     [RaisesException] DOMString getCurrentCursorInfo();
 
diff -Nru webkitgtk-2.4.7/Source/WebKit/gtk/ChangeLog webkitgtk-2.4.8/Source/WebKit/gtk/ChangeLog
--- webkitgtk-2.4.7/Source/WebKit/gtk/ChangeLog	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit/gtk/ChangeLog	2015-01-07 11:45:43.000000000 +0200
@@ -1,3 +1,9 @@
+2014-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update NEWS and Versions.m4 for 2.4.7 release.
+
+        * NEWS: Added release notes for 2.4.7.
+
 2014-09-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update NEWS and Versions.m4 for 2.4.6 release.
diff -Nru webkitgtk-2.4.7/Source/WebKit/gtk/NEWS webkitgtk-2.4.8/Source/WebKit/gtk/NEWS
--- webkitgtk-2.4.7/Source/WebKit/gtk/NEWS	2014-10-22 13:36:37.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit/gtk/NEWS	2015-01-07 11:58:32.000000000 +0200
@@ -1,4 +1,16 @@
 =================
+WebKitGTK+  2.4.8
+=================
+
+  - Fix SSL connection issues with some websites after the POODLE vulnerability fix.
+  - Fix a crash when loading flash plugins.
+  - Fix build on GNU Hurd
+  - Fix build on OS X.
+  - Fix documentation of webkit_print_operation_get_page_setup().
+  - Security fixes: CVE-2014-1344, CVE-2014-1384, CVE-2014-1385, CVE-2014-1386,
+    CVE-2014-1387, CVE-2014-1388, CVE-2014-1389, CVE-2014-1390.
+
+=================
 WebKitGTK+  2.4.7
 =================
 
diff -Nru webkitgtk-2.4.7/Source/WebKit2/gtk/MainGtk.cpp webkitgtk-2.4.8/Source/WebKit2/gtk/MainGtk.cpp
--- webkitgtk-2.4.7/Source/WebKit2/gtk/MainGtk.cpp	2014-10-22 13:24:56.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/gtk/MainGtk.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -38,7 +38,7 @@
     // overwrite this priority string if it's already set by the user.
     // Keep this in sync with WebProcessMain.cpp.
     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
-    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0", 0);
 
     return WebKit::WebProcessMainGtk(argc, argv);
 }
diff -Nru webkitgtk-2.4.7/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp webkitgtk-2.4.8/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
--- webkitgtk-2.4.7/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -255,12 +255,13 @@
     m_request = m_suggestedRequestForWillSendRequest;
     m_suggestedRequestForWillSendRequest = ResourceRequest();
 
-    m_handle->continueWillSendRequest(m_request);
-
     if (m_request.isNull()) {
         m_handle->cancel();
         didFail(m_handle.get(), cancelledError(m_request));
+        return;
     }
+
+    m_handle->continueWillSendRequest(m_request);
 }
 
 void NetworkResourceLoader::continueDidReceiveResponse()
diff -Nru webkitgtk-2.4.7/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp webkitgtk-2.4.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
--- webkitgtk-2.4.7/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -102,8 +102,9 @@
 bool PluginControllerProxy::initialize(const PluginCreationParameters& creationParameters)
 {
     ASSERT(!m_plugin);
-    
-    TemporaryChange<bool> initializing(m_isInitializing, true);
+
+    ASSERT(!m_isInitializing);
+    m_isInitializing = true; // Cannot use TemporaryChange here, because this object can be deleted before the function returns.
 
     m_plugin = NetscapePlugin::create(PluginProcess::shared().netscapePluginModule());
     if (!m_plugin) {
@@ -131,6 +132,7 @@
 
     platformInitialize(creationParameters);
 
+    m_isInitializing = false;
     return true;
 }
 
diff -Nru webkitgtk-2.4.7/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp webkitgtk-2.4.8/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
--- webkitgtk-2.4.7/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -357,7 +357,7 @@
  * @print_operation: a #WebKitPrintOperation
  *
  * Return the current page setup of @print_operation. It returns %NULL until
- * either webkit_print_operation_set_print_settings() or webkit_print_operation_run_dialog()
+ * either webkit_print_operation_set_page_setup() or webkit_print_operation_run_dialog()
  * have been called.
  *
  * Returns: (transfer none): the current #GtkPageSetup of @print_operation.
diff -Nru webkitgtk-2.4.7/Source/WebKit2/UIProcess/WebPageProxy.cpp webkitgtk-2.4.8/Source/WebKit2/UIProcess/WebPageProxy.cpp
--- webkitgtk-2.4.7/Source/WebKit2/UIProcess/WebPageProxy.cpp	2014-10-22 11:16:10.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -3515,7 +3515,7 @@
         break;
 
     case WebEvent::Wheel: {
-        ASSERT(!m_currentlyProcessedWheelEvents.isEmpty());
+        MESSAGE_CHECK(!m_currentlyProcessedWheelEvents.isEmpty());
 
         OwnPtr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
 
@@ -3539,10 +3539,10 @@
     case WebEvent::Char: {
         LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
 
-        NativeWebKeyboardEvent event = m_keyEventQueue.first();
-        MESSAGE_CHECK(type == event.type());
+        MESSAGE_CHECK(!m_keyEventQueue.isEmpty());
+        NativeWebKeyboardEvent event = m_keyEventQueue.takeFirst();
 
-        m_keyEventQueue.removeFirst();
+        MESSAGE_CHECK(type == event.type());
 
         if (!m_keyEventQueue.isEmpty())
             m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
@@ -3560,9 +3560,10 @@
     case WebEvent::TouchMove:
     case WebEvent::TouchEnd:
     case WebEvent::TouchCancel: {
-        QueuedTouchEvents queuedEvents = m_touchEventQueue.first();
+        MESSAGE_CHECK(!m_touchEventQueue.isEmpty());
+        QueuedTouchEvents queuedEvents = m_touchEventQueue.takeFirst();
+
         MESSAGE_CHECK(type == queuedEvents.forwardedEvent.type());
-        m_touchEventQueue.removeFirst();
 
         m_pageClient.doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
         for (size_t i = 0; i < queuedEvents.deferredTouchEvents.size(); ++i) {
diff -Nru webkitgtk-2.4.7/Source/WebKit2/unix/NetworkMainUnix.cpp webkitgtk-2.4.8/Source/WebKit2/unix/NetworkMainUnix.cpp
--- webkitgtk-2.4.7/Source/WebKit2/unix/NetworkMainUnix.cpp	2014-10-22 13:28:23.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/unix/NetworkMainUnix.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -42,7 +42,7 @@
     // overwrite this priority string if it's already set by the user.
     // Keep this in sync with WebProcessMain.cpp.
     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
-    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:%LATEST_RECORD_VERSION:!VERS-SSL3.0", 0);
 
     return WebKit::NetworkProcessMain(argc, argv);
 }
diff -Nru webkitgtk-2.4.7/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp webkitgtk-2.4.8/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
--- webkitgtk-2.4.7/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp	2014-10-22 11:16:10.000000000 +0300
+++ webkitgtk-2.4.8/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp	2015-01-07 11:45:43.000000000 +0200
@@ -201,7 +201,9 @@
 bool NetscapePlugin::platformPostInitialize()
 {
     uint64_t windowID = 0;
-    bool needsXEmbed = false;
+    // NPPVpluginNeedsXEmbed is a boolean value, but at least the
+    // Flash player plugin is using an 'int' instead.
+    int needsXEmbed = 0;
     if (m_isWindowed) {
         NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);
         if (needsXEmbed) {
diff -Nru webkitgtk-2.4.7/Source/WTF/wtf/InlineASM.h webkitgtk-2.4.8/Source/WTF/wtf/InlineASM.h
--- webkitgtk-2.4.7/Source/WTF/wtf/InlineASM.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WTF/wtf/InlineASM.h	2015-01-07 11:45:42.000000000 +0200
@@ -82,6 +82,7 @@
 #elif   OS(LINUX)               \
      || OS(FREEBSD)             \
      || OS(OPENBSD)             \
+     || OS(HURD)                \
      || OS(NETBSD)
     // GNU as-compatible syntax.
 #define LOCAL_LABEL_STRING(name) ".L" #name
diff -Nru webkitgtk-2.4.7/Source/WTF/wtf/Platform.h webkitgtk-2.4.8/Source/WTF/wtf/Platform.h
--- webkitgtk-2.4.7/Source/WTF/wtf/Platform.h	2014-10-22 11:16:09.000000000 +0300
+++ webkitgtk-2.4.8/Source/WTF/wtf/Platform.h	2015-01-07 11:45:42.000000000 +0200
@@ -723,15 +723,15 @@
    low-level interpreter. */
 #if !defined(ENABLE_LLINT) \
     && ENABLE(JIT) \
-    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
+    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD)) \
     && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
     && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
 #define ENABLE_LLINT 1
 #endif
 
 #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
-/* Enable the DFG JIT on X86 and X86_64.  Only tested on Mac, GNU/Linux and FreeBSD. */
-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD))
+/* Enable the DFG JIT on X86 and X86_64. */
+#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD))
 #define ENABLE_DFG_JIT 1
 #endif
 /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */

Reply to:

Follow-Ups:
- Bug#776286: marked as done (unblock: webkitgtk/2.4.8-1)
  - From: owner@bugs.debian.org (Debian Bug Tracking System)

Prev by Date: Bug#776201: marked as done (unblock: pcmanfm/1.2.3-1.1)
Next by Date: Bug#774211: freeze exception for binutils 2.25-3
Previous by thread: Bug#776276: unblock: open-iscsi/2.0.873+git0.3b4b4500-4
Next by thread: Bug#776286: marked as done (unblock: webkitgtk/2.4.8-1)
Index(es):
- Date
- Thread