[webkitgtk-tarball-releases] Import webkitgtk-1.10.0

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [webkitgtk-tarball-releases] Import webkitgtk-1.10.0
Date: Wed, 26 Sep 2012 14:50:57 +0000 (UTC)
commit d53411fffe1ae07dd01008e3245c2806219a776b
Author: Colin Walters <walters verbum org>
Date:   Wed Sep 26 10:46:50 2012 -0400

    Import webkitgtk-1.10.0

 ChangeLog                                          |   18 +++
 Documentation/webkit2gtk/html/ch01.html            |    2 +-
 Documentation/webkit2gtk/html/index.html           |    2 +-
 .../webkit2gtk/html/webkit2gtk-WebKitVersion.html  |    4 +-
 .../webkit2gtk/tmpl/WebKitBackForwardList.sgml     |    2 +
 .../webkit2gtk/tmpl/WebKitBackForwardListItem.sgml |    2 +
 .../webkit2gtk/tmpl/WebKitContextMenu.sgml         |    2 +
 .../webkit2gtk/tmpl/WebKitContextMenuItem.sgml     |    2 +
 .../webkit2gtk/tmpl/WebKitCookieManager.sgml       |    2 +
 Documentation/webkit2gtk/tmpl/WebKitDownload.sgml  |    2 +
 Documentation/webkit2gtk/tmpl/WebKitError.sgml     |    2 +
 .../webkit2gtk/tmpl/WebKitFileChooserRequest.sgml  |    2 +
 .../webkit2gtk/tmpl/WebKitFindController.sgml      |    2 +
 .../tmpl/WebKitFormSubmissionRequest.sgml          |    2 +
 .../tmpl/WebKitGeolocationPermissionRequest.sgml   |    2 +
 .../webkit2gtk/tmpl/WebKitHitTestResult.sgml       |    2 +
 .../tmpl/WebKitNavigationPolicyDecision.sgml       |    2 +
 .../webkit2gtk/tmpl/WebKitPermissionRequest.sgml   |    2 +
 Documentation/webkit2gtk/tmpl/WebKitPlugin.sgml    |    2 +
 .../webkit2gtk/tmpl/WebKitPolicyDecision.sgml      |    2 +
 .../webkit2gtk/tmpl/WebKitPrintOperation.sgml      |    2 +
 .../tmpl/WebKitResponsePolicyDecision.sgml         |    2 +
 Documentation/webkit2gtk/tmpl/WebKitSettings.sgml  |    2 +
 .../webkit2gtk/tmpl/WebKitURIRequest.sgml          |    2 +
 .../webkit2gtk/tmpl/WebKitURIResponse.sgml         |    2 +
 .../webkit2gtk/tmpl/WebKitURISchemeRequest.sgml    |    2 +
 Documentation/webkit2gtk/tmpl/WebKitVersion.sgml   |    2 +
 .../webkit2gtk/tmpl/WebKitWebContext.sgml          |    2 +
 .../webkit2gtk/tmpl/WebKitWebInspector.sgml        |    2 +
 .../webkit2gtk/tmpl/WebKitWebResource.sgml         |    2 +
 Documentation/webkit2gtk/tmpl/WebKitWebView.sgml   |    2 +
 .../webkit2gtk/tmpl/WebKitWebViewBase.sgml         |    2 +
 .../webkit2gtk/tmpl/WebKitWindowProperties.sgml    |    2 +
 .../webkit2gtk/tmpl/webkit2gtk-unused.sgml         |   30 -----
 Documentation/webkitgtk/html/ch01.html             |    2 +-
 Documentation/webkitgtk/html/ch02.html             |    2 +-
 Documentation/webkitgtk/html/ch03.html             |    2 +-
 Documentation/webkitgtk/html/index.html            |    2 +-
 .../webkitgtk/html/webkit-environment.html         |    2 +-
 .../webkitgtk/html/webkitgtk-Global-functions.html |    2 +-
 Documentation/webkitgtk/html/webkitgtk.devhelp2    |    2 +-
 Documentation/webkitgtk/tmpl/webkit.sgml           |    2 +
 Documentation/webkitgtk/tmpl/webkitdefines.sgml    |    2 +
 Documentation/webkitgtk/tmpl/webkitdownload.sgml   |    2 +
 Documentation/webkitgtk/tmpl/webkiterror.sgml      |    2 +
 .../webkitgtk/tmpl/webkitfavicondatabase.sgml      |    2 +
 .../webkitgtk/tmpl/webkitfilechooserrequest.sgml   |    2 +
 .../tmpl/webkitgeolocationpolicydecision.sgml      |    2 +
 Documentation/webkitgtk/tmpl/webkitgtk-unused.sgml |   34 ------
 .../webkitgtk/tmpl/webkithittestresult.sgml        |    2 +
 .../webkitgtk/tmpl/webkiticondatabase.sgml         |    2 +
 .../webkitgtk/tmpl/webkitnetworkrequest.sgml       |    2 +
 .../webkitgtk/tmpl/webkitnetworkresponse.sgml      |    2 +
 .../webkitgtk/tmpl/webkitsecurityorigin.sgml       |    2 +
 .../webkitgtk/tmpl/webkitsoupauthdialog.sgml       |    2 +
 .../webkitgtk/tmpl/webkitspellchecker.sgml         |    2 +
 .../webkitgtk/tmpl/webkitviewportattributes.sgml   |    2 +
 .../webkitgtk/tmpl/webkitwebbackforwardlist.sgml   |    2 +
 .../webkitgtk/tmpl/webkitwebdatabase.sgml          |    2 +
 .../webkitgtk/tmpl/webkitwebdatasource.sgml        |    2 +
 Documentation/webkitgtk/tmpl/webkitwebframe.sgml   |    2 +
 .../webkitgtk/tmpl/webkitwebhistoryitem.sgml       |    2 +
 .../webkitgtk/tmpl/webkitwebinspector.sgml         |    2 +
 .../webkitgtk/tmpl/webkitwebnavigationaction.sgml  |    2 +
 Documentation/webkitgtk/tmpl/webkitwebplugin.sgml  |    2 +
 .../webkitgtk/tmpl/webkitwebplugindatabase.sgml    |    2 +
 .../webkitgtk/tmpl/webkitwebpolicydecision.sgml    |    2 +
 .../webkitgtk/tmpl/webkitwebresource.sgml          |    2 +
 .../webkitgtk/tmpl/webkitwebsettings.sgml          |    2 +
 Documentation/webkitgtk/tmpl/webkitwebview.sgml    |    2 +
 .../webkitgtk/tmpl/webkitwebwindowfeatures.sgml    |    2 +
 GNUmakefile.am                                     |    5 -
 GNUmakefile.in                                     |    5 -
 NEWS                                               |   10 ++
 Source/WebCore/ChangeLog                           |   35 ++++++
 .../platform/gtk/RedirectedXCompositeWindow.cpp    |    6 +-
 .../platform/gtk/RedirectedXCompositeWindow.h      |    1 +
 Source/WebKit/gtk/ChangeLog                        |    6 +
 Source/WebKit/gtk/NEWS                             |   10 ++
 .../UIProcess/API/gtk/WebKitWebViewBase.cpp        |  119 ++++++++++++++++----
 .../UIProcess/API/gtk/WebKitWebViewBasePrivate.h   |    4 +
 Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h    |    7 +-
 Source/WebKit2/UIProcess/WebPageProxy.h            |    3 +-
 Source/WebKit2/UIProcess/WebPageProxy.messages.in  |    4 +
 Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp   |    9 +-
 Source/WebKit2/WebProcess/WebPage/WebPage.h        |    3 +-
 .../WebKit2/WebProcess/WebPage/WebPage.messages.in |    2 +-
 .../WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp    |   10 ++-
 .../WebProcess/WebPage/gtk/LayerTreeHostGtk.h      |    5 +-
 .../WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp  |    7 +-
 configure                                          |   38 +++---
 configure.ac                                       |   12 +-
 92 files changed, 376 insertions(+), 145 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7c883f0..06a727c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-08-23  Martin Robinson  <mrobinson igalia com>
+
+        [GTK] The tarball should be called webkitgtk-x.x.x.tar.xz
+        https://bugs.webkit.org/show_bug.cgi?id=94572
+
+        Reviewed by Carlos Garcia Campos.
+
+        Change the name of the tarball to match the name of the library
+        and to disambiguate it from other WebKit ports.
+
+        * configure.ac: Update the tarball name.
+
+2012-09-17  Carlos Garcia Campos  <cgarcia igalia com>
+
+        Unreviewed. Update NEWS and configure.ac for 1.9.92 release
+
+        * configure.ac: Bump version numbers.
+
 2012-09-05  Carlos Garcia Campos  <cgarcia igalia com>
 
         Unreviewed. Update NEWS and configure.ac for 1.9.91 release
diff --git a/Documentation/webkit2gtk/html/ch01.html b/Documentation/webkit2gtk/html/ch01.html
index 76f8aee..9818ef9 100644
--- a/Documentation/webkit2gtk/html/ch01.html
+++ b/Documentation/webkit2gtk/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp597768"></a>Class Overview</h2></div></div></div>
+<a name="idp2620200"></a>Class Overview</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="WebKitWebContext.html">WebKitWebContext</a></span><span class="refpurpose"></span>
diff --git a/Documentation/webkit2gtk/html/index.html b/Documentation/webkit2gtk/html/index.html
index ce1a8bd..cb15cee 100644
--- a/Documentation/webkit2gtk/html/index.html
+++ b/Documentation/webkit2gtk/html/index.html
@@ -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+ 1.9.92</p></div>
+<div><p class="releaseinfo">for WebKit2GTK+ 1.10.0</p></div>
 </div>
 <hr>
 </div>
diff --git a/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html b/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html
index 6488cc7..994383b 100644
--- a/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html
+++ b/Documentation/webkit2gtk/html/webkit2gtk-WebKitVersion.html
@@ -135,7 +135,7 @@ against at application run time.
 <hr>
 <div class="refsect2">
 <a name="WEBKIT-MINOR-VERSION:CAPS"></a><h3>WEBKIT_MINOR_VERSION</h3>
-<pre class="programlisting">#define WEBKIT_MINOR_VERSION (9)
+<pre class="programlisting">#define WEBKIT_MINOR_VERSION (10)
 </pre>
 <p>
 Like <a class="link" href="webkit2gtk-WebKitVersion.html#webkit-get-minor-version" title="webkit_get_minor_version ()"><code class="function">webkit_get_minor_version()</code></a>, but from the headers used at
@@ -146,7 +146,7 @@ against at application run time.
 <hr>
 <div class="refsect2">
 <a name="WEBKIT-MICRO-VERSION:CAPS"></a><h3>WEBKIT_MICRO_VERSION</h3>
-<pre class="programlisting">#define WEBKIT_MICRO_VERSION (92)
+<pre class="programlisting">#define WEBKIT_MICRO_VERSION (0)
 </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
diff --git a/Documentation/webkit2gtk/tmpl/WebKitBackForwardList.sgml b/Documentation/webkit2gtk/tmpl/WebKitBackForwardList.sgml
index ce76320..c084534 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitBackForwardList.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitBackForwardList.sgml
@@ -9,11 +9,13 @@ WebKitBackForwardList
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitBackForwardListItem.sgml b/Documentation/webkit2gtk/tmpl/WebKitBackForwardListItem.sgml
index 87116cd..cb167c0 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitBackForwardListItem.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitBackForwardListItem.sgml
@@ -9,11 +9,13 @@ WebKitBackForwardListItem
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitContextMenu.sgml b/Documentation/webkit2gtk/tmpl/WebKitContextMenu.sgml
index 31e72e3..0c2bb2c 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitContextMenu.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitContextMenu.sgml
@@ -9,11 +9,13 @@ WebKitContextMenu
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitContextMenuItem.sgml b/Documentation/webkit2gtk/tmpl/WebKitContextMenuItem.sgml
index f5b0a03..19aafcb 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitContextMenuItem.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitContextMenuItem.sgml
@@ -9,11 +9,13 @@ WebKitContextMenuItem
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitCookieManager.sgml b/Documentation/webkit2gtk/tmpl/WebKitCookieManager.sgml
index a881ef5..498d27b 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitCookieManager.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitCookieManager.sgml
@@ -9,11 +9,13 @@ WebKitCookieManager
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitDownload.sgml b/Documentation/webkit2gtk/tmpl/WebKitDownload.sgml
index cd69fdb..5ac2a52 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitDownload.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitDownload.sgml
@@ -9,11 +9,13 @@ WebKitDownload
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitError.sgml b/Documentation/webkit2gtk/tmpl/WebKitError.sgml
index f0011e8..76ecc76 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitError.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitError.sgml
@@ -9,11 +9,13 @@ WebKitError
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitFileChooserRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitFileChooserRequest.sgml
index 39664b2..1fc2e53 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitFileChooserRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitFileChooserRequest.sgml
@@ -9,11 +9,13 @@ WebKitFileChooserRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitFindController.sgml b/Documentation/webkit2gtk/tmpl/WebKitFindController.sgml
index 2eb0216..1ccf6a6 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitFindController.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitFindController.sgml
@@ -9,11 +9,13 @@ WebKitFindController
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitFormSubmissionRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitFormSubmissionRequest.sgml
index 58af08c..2628cb6 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitFormSubmissionRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitFormSubmissionRequest.sgml
@@ -9,11 +9,13 @@ WebKitFormSubmissionRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitGeolocationPermissionRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitGeolocationPermissionRequest.sgml
index 6f5f193..2e3a8bb 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitGeolocationPermissionRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitGeolocationPermissionRequest.sgml
@@ -9,11 +9,13 @@ WebKitGeolocationPermissionRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitHitTestResult.sgml b/Documentation/webkit2gtk/tmpl/WebKitHitTestResult.sgml
index 0c4594d..414e087 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitHitTestResult.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitHitTestResult.sgml
@@ -9,11 +9,13 @@ WebKitHitTestResult
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitNavigationPolicyDecision.sgml b/Documentation/webkit2gtk/tmpl/WebKitNavigationPolicyDecision.sgml
index ab89ac3..44958fd 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitNavigationPolicyDecision.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitNavigationPolicyDecision.sgml
@@ -9,11 +9,13 @@ WebKitNavigationPolicyDecision
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitPermissionRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitPermissionRequest.sgml
index a069604..c122bfa 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitPermissionRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitPermissionRequest.sgml
@@ -9,11 +9,13 @@ WebKitPermissionRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitPlugin.sgml b/Documentation/webkit2gtk/tmpl/WebKitPlugin.sgml
index 8252cda..decc3fe 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitPlugin.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitPlugin.sgml
@@ -9,11 +9,13 @@ WebKitPlugin
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitPolicyDecision.sgml b/Documentation/webkit2gtk/tmpl/WebKitPolicyDecision.sgml
index e2b4397..422a1a5 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitPolicyDecision.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitPolicyDecision.sgml
@@ -9,11 +9,13 @@ WebKitPolicyDecision
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitPrintOperation.sgml b/Documentation/webkit2gtk/tmpl/WebKitPrintOperation.sgml
index 458ca44..3e45bb3 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitPrintOperation.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitPrintOperation.sgml
@@ -9,11 +9,13 @@ WebKitPrintOperation
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitResponsePolicyDecision.sgml b/Documentation/webkit2gtk/tmpl/WebKitResponsePolicyDecision.sgml
index 5e5bd73..295559b 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitResponsePolicyDecision.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitResponsePolicyDecision.sgml
@@ -9,11 +9,13 @@ WebKitResponsePolicyDecision
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitSettings.sgml b/Documentation/webkit2gtk/tmpl/WebKitSettings.sgml
index 9174fb8..8f83649 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitSettings.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitSettings.sgml
@@ -9,11 +9,13 @@ WebKitSettings
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitURIRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitURIRequest.sgml
index 548a863..e3bc7ca 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitURIRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitURIRequest.sgml
@@ -9,11 +9,13 @@ WebKitURIRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitURIResponse.sgml b/Documentation/webkit2gtk/tmpl/WebKitURIResponse.sgml
index 3d09c68..d3f3538 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitURIResponse.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitURIResponse.sgml
@@ -9,11 +9,13 @@ WebKitURIResponse
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitURISchemeRequest.sgml b/Documentation/webkit2gtk/tmpl/WebKitURISchemeRequest.sgml
index f2552c6..17c321d 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitURISchemeRequest.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitURISchemeRequest.sgml
@@ -9,11 +9,13 @@ WebKitURISchemeRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitVersion.sgml b/Documentation/webkit2gtk/tmpl/WebKitVersion.sgml
index c40768b..e8f1bc8 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitVersion.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitVersion.sgml
@@ -9,11 +9,13 @@ WebKitVersion
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWebContext.sgml b/Documentation/webkit2gtk/tmpl/WebKitWebContext.sgml
index 98c7ebe..ef68165 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWebContext.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWebContext.sgml
@@ -9,11 +9,13 @@ WebKitWebContext
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWebInspector.sgml b/Documentation/webkit2gtk/tmpl/WebKitWebInspector.sgml
index 54aa134..fab56e6 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWebInspector.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWebInspector.sgml
@@ -9,11 +9,13 @@ WebKitWebInspector
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWebResource.sgml b/Documentation/webkit2gtk/tmpl/WebKitWebResource.sgml
index fc0d70b..0752d00 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWebResource.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWebResource.sgml
@@ -9,11 +9,13 @@ WebKitWebResource
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWebView.sgml b/Documentation/webkit2gtk/tmpl/WebKitWebView.sgml
index c978414..7a91fbe 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWebView.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWebView.sgml
@@ -9,11 +9,13 @@ WebKitWebView
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWebViewBase.sgml b/Documentation/webkit2gtk/tmpl/WebKitWebViewBase.sgml
index a920222..d887a52 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWebViewBase.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWebViewBase.sgml
@@ -9,11 +9,13 @@ WebKitWebViewBase
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/WebKitWindowProperties.sgml b/Documentation/webkit2gtk/tmpl/WebKitWindowProperties.sgml
index 9688d4a..01913b0 100644
--- a/Documentation/webkit2gtk/tmpl/WebKitWindowProperties.sgml
+++ b/Documentation/webkit2gtk/tmpl/WebKitWindowProperties.sgml
@@ -9,11 +9,13 @@ WebKitWindowProperties
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkit2gtk/tmpl/webkit2gtk-unused.sgml b/Documentation/webkit2gtk/tmpl/webkit2gtk-unused.sgml
index 1a4eb75..e69de29 100644
--- a/Documentation/webkit2gtk/tmpl/webkit2gtk-unused.sgml
+++ b/Documentation/webkit2gtk/tmpl/webkit2gtk-unused.sgml
@@ -1,30 +0,0 @@
-<!-- ##### ENUM WebKitSecurityPolicy ##### -->
-<para>
-
-</para>
-
- WEBKIT_SECURITY_POLICY_LOCAL: 
- WEBKIT_SECURITY_POLICY_NO_ACCESS_TO_OTHER_SCHEME: 
- WEBKIT_SECURITY_POLICY_DISPLAY_ISOLATED: 
- WEBKIT_SECURITY_POLICY_SECURE: 
- WEBKIT_SECURITY_POLICY_CORS_ENABLED: 
- WEBKIT_SECURITY_POLICY_EMPTY_DOCUMENT: 
-
-<!-- ##### FUNCTION webkit_web_context_get_security_policy_for_uri_scheme ##### -->
-<para>
-
-</para>
-
- context: 
- scheme: 
- Returns: 
-
-<!-- ##### FUNCTION webkit_web_context_set_security_policy_for_uri_scheme ##### -->
-<para>
-
-</para>
-
- context: 
- scheme: 
- policy: 
-
diff --git a/Documentation/webkitgtk/html/ch01.html b/Documentation/webkitgtk/html/ch01.html
index 764ace0..2c2b2e3 100644
--- a/Documentation/webkitgtk/html/ch01.html
+++ b/Documentation/webkitgtk/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp2966872"></a>Global functions</h2></div></div></div>
+<a name="idp2884784"></a>Global functions</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="webkitgtk-Global-functions.html">Global functions</a></span><span class="refpurpose"> â Global functions controlling WebKit</span>
 </dt></dl></div>
diff --git a/Documentation/webkitgtk/html/ch02.html b/Documentation/webkitgtk/html/ch02.html
index e8298c7..127f40a 100644
--- a/Documentation/webkitgtk/html/ch02.html
+++ b/Documentation/webkitgtk/html/ch02.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp50256"></a>Class Overview</h2></div></div></div>
+<a name="idp7288"></a>Class Overview</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="webkitgtk-webkitwebview.html">WebKitWebView</a></span><span class="refpurpose"> â The central class of the WebKitGTK+ API</span>
diff --git a/Documentation/webkitgtk/html/ch03.html b/Documentation/webkitgtk/html/ch03.html
index 25042f9..3d8f3de 100644
--- a/Documentation/webkitgtk/html/ch03.html
+++ b/Documentation/webkitgtk/html/ch03.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp2413448"></a>Running WebKitGTK+-based programs</h2></div></div></div>
+<a name="idp2411464"></a>Running WebKitGTK+-based programs</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="webkit-environment.html">Environment</a></span><span class="refpurpose"> â How does the environment affect applications that use WebKitGTK+</span>
 </dt></dl></div>
diff --git a/Documentation/webkitgtk/html/index.html b/Documentation/webkitgtk/html/index.html
index 1900ba3..9998437 100644
--- a/Documentation/webkitgtk/html/index.html
+++ b/Documentation/webkitgtk/html/index.html
@@ -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+ 1.9.92</p></div>
+<div><p class="releaseinfo">for WebKitGTK+ 1.10.0</p></div>
 </div>
 <hr>
 </div>
diff --git a/Documentation/webkitgtk/html/webkit-environment.html b/Documentation/webkitgtk/html/webkit-environment.html
index e6c4693..14fa912 100644
--- a/Documentation/webkitgtk/html/webkit-environment.html
+++ b/Documentation/webkitgtk/html/webkit-environment.html
@@ -29,7 +29,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect2">
-<a name="idp4774008"></a><h3>Logging</h3>
+<a name="idp5365584"></a><h3>Logging</h3>
 <p>
 You can make WebKitGTK+ log some of what it is doing internally by
 using the <code class="literal">WEBKIT_DEBUG</code> environment variable. It
diff --git a/Documentation/webkitgtk/html/webkitgtk-Global-functions.html b/Documentation/webkitgtk/html/webkitgtk-Global-functions.html
index 949e4f4..2c056c9 100644
--- a/Documentation/webkitgtk/html/webkitgtk-Global-functions.html
+++ b/Documentation/webkitgtk/html/webkitgtk-Global-functions.html
@@ -693,7 +693,7 @@ In order to inspect the default context menu, you should connect to
 <p>
 </p>
 <div class="example">
-<a name="idp5502952"></a><p class="title"><b>ExampleÂ1.ÂInspecting the default context menu</b></p>
+<a name="idp5645072"></a><p class="title"><b>ExampleÂ1.ÂInspecting the default context menu</b></p>
 <div class="example-contents">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
     <tbody>
diff --git a/Documentation/webkitgtk/html/webkitgtk.devhelp2 b/Documentation/webkitgtk/html/webkitgtk.devhelp2
index bd8c65c..e011512 100644
--- a/Documentation/webkitgtk/html/webkitgtk.devhelp2
+++ b/Documentation/webkitgtk/html/webkitgtk.devhelp2
@@ -605,7 +605,7 @@
     <keyword type="property" name="The &quot;mime-types&quot; property" link="WebKitFileChooserRequest.html#WebKitFileChooserRequest--mime-types"/>
     <keyword type="property" name="The &quot;select-multiple&quot; property" link="WebKitFileChooserRequest.html#WebKitFileChooserRequest--select-multiple"/>
     <keyword type="property" name="The &quot;selected-files&quot; property" link="WebKitFileChooserRequest.html#WebKitFileChooserRequest--selected-files"/>
-    <keyword type="" name="Logging" link="webkit-environment.html#idp4774008"/>
+    <keyword type="" name="Logging" link="webkit-environment.html#idp5365584"/>
     <keyword type="constant" name="WEBKIT_CACHE_MODEL_DEFAULT" link="webkitgtk-Global-functions.html#WEBKIT-CACHE-MODEL-DEFAULT:CAPS"/>
     <keyword type="constant" name="WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER" link="webkitgtk-Global-functions.html#WEBKIT-CACHE-MODEL-DOCUMENT-VIEWER:CAPS"/>
     <keyword type="constant" name="WEBKIT_CACHE_MODEL_WEB_BROWSER" link="webkitgtk-Global-functions.html#WEBKIT-CACHE-MODEL-WEB-BROWSER:CAPS"/>
diff --git a/Documentation/webkitgtk/tmpl/webkit.sgml b/Documentation/webkitgtk/tmpl/webkit.sgml
index 31fd083..117914c 100644
--- a/Documentation/webkitgtk/tmpl/webkit.sgml
+++ b/Documentation/webkitgtk/tmpl/webkit.sgml
@@ -9,11 +9,13 @@ Global functions
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitdefines.sgml b/Documentation/webkitgtk/tmpl/webkitdefines.sgml
index 06f2728..c44337e 100644
--- a/Documentation/webkitgtk/tmpl/webkitdefines.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitdefines.sgml
@@ -9,11 +9,13 @@ webkitdefines
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitdownload.sgml b/Documentation/webkitgtk/tmpl/webkitdownload.sgml
index 343a37b..173c306 100644
--- a/Documentation/webkitgtk/tmpl/webkitdownload.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitdownload.sgml
@@ -9,11 +9,13 @@ WebKitDownload
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkiterror.sgml b/Documentation/webkitgtk/tmpl/webkiterror.sgml
index 4a5a3a5..732f388 100644
--- a/Documentation/webkitgtk/tmpl/webkiterror.sgml
+++ b/Documentation/webkitgtk/tmpl/webkiterror.sgml
@@ -9,11 +9,13 @@ webkiterror
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitfavicondatabase.sgml b/Documentation/webkitgtk/tmpl/webkitfavicondatabase.sgml
index 7d9ba7e..f151eed 100644
--- a/Documentation/webkitgtk/tmpl/webkitfavicondatabase.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitfavicondatabase.sgml
@@ -9,11 +9,13 @@ WebKitFaviconDatabase
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitfilechooserrequest.sgml b/Documentation/webkitgtk/tmpl/webkitfilechooserrequest.sgml
index 58e90f8..e203df6 100644
--- a/Documentation/webkitgtk/tmpl/webkitfilechooserrequest.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitfilechooserrequest.sgml
@@ -9,11 +9,13 @@ WebKitFileChooserRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitgeolocationpolicydecision.sgml b/Documentation/webkitgtk/tmpl/webkitgeolocationpolicydecision.sgml
index 66ba687..cfc736d 100644
--- a/Documentation/webkitgtk/tmpl/webkitgeolocationpolicydecision.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitgeolocationpolicydecision.sgml
@@ -9,11 +9,13 @@ WebKitGeolocationPolicyDecision
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitgtk-unused.sgml b/Documentation/webkitgtk/tmpl/webkitgtk-unused.sgml
index 0397b8f..e69de29 100644
--- a/Documentation/webkitgtk/tmpl/webkitgtk-unused.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitgtk-unused.sgml
@@ -1,34 +0,0 @@
-<!-- ##### ENUM WebKitSecurityPolicy ##### -->
-<para>
-
-</para>
-
- WEBKIT_SECURITY_POLICY_LOCAL: 
- WEBKIT_SECURITY_POLICY_NO_ACCESS_TO_OTHER_SCHEME: 
- WEBKIT_SECURITY_POLICY_DISPLAY_ISOLATED: 
- WEBKIT_SECURITY_POLICY_SECURE: 
- WEBKIT_SECURITY_POLICY_CORS_ENABLED: 
- WEBKIT_SECURITY_POLICY_EMPTY_DOCUMENT: 
-
-<!-- ##### ARG WebKitWebSettings:enable-css-shaders ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION webkit_get_security_policy_for_uri_scheme ##### -->
-<para>
-
-</para>
-
- scheme: 
- Returns: 
-
-<!-- ##### FUNCTION webkit_set_security_policy_for_uri_scheme ##### -->
-<para>
-
-</para>
-
- scheme: 
- policy: 
-
diff --git a/Documentation/webkitgtk/tmpl/webkithittestresult.sgml b/Documentation/webkitgtk/tmpl/webkithittestresult.sgml
index 6a6dddb..9ee0479 100644
--- a/Documentation/webkitgtk/tmpl/webkithittestresult.sgml
+++ b/Documentation/webkitgtk/tmpl/webkithittestresult.sgml
@@ -9,11 +9,13 @@ WebKitHitTestResult
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkiticondatabase.sgml b/Documentation/webkitgtk/tmpl/webkiticondatabase.sgml
index 031216f..0dcc483 100644
--- a/Documentation/webkitgtk/tmpl/webkiticondatabase.sgml
+++ b/Documentation/webkitgtk/tmpl/webkiticondatabase.sgml
@@ -9,11 +9,13 @@ WebKitIconDatabase
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitnetworkrequest.sgml b/Documentation/webkitgtk/tmpl/webkitnetworkrequest.sgml
index 89d07ef..4424023 100644
--- a/Documentation/webkitgtk/tmpl/webkitnetworkrequest.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitnetworkrequest.sgml
@@ -9,11 +9,13 @@ WebKitNetworkRequest
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitnetworkresponse.sgml b/Documentation/webkitgtk/tmpl/webkitnetworkresponse.sgml
index a30c172..efcc003 100644
--- a/Documentation/webkitgtk/tmpl/webkitnetworkresponse.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitnetworkresponse.sgml
@@ -9,11 +9,13 @@ WebKitNetworkResponse
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitsecurityorigin.sgml b/Documentation/webkitgtk/tmpl/webkitsecurityorigin.sgml
index f6fa9a2..a891ed1 100644
--- a/Documentation/webkitgtk/tmpl/webkitsecurityorigin.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitsecurityorigin.sgml
@@ -9,11 +9,13 @@ WebKitSecurityOrigin
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitsoupauthdialog.sgml b/Documentation/webkitgtk/tmpl/webkitsoupauthdialog.sgml
index 2be90a7..8c138fd 100644
--- a/Documentation/webkitgtk/tmpl/webkitsoupauthdialog.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitsoupauthdialog.sgml
@@ -9,11 +9,13 @@ WebKitSoupAuthDialog
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitspellchecker.sgml b/Documentation/webkitgtk/tmpl/webkitspellchecker.sgml
index 145b46e..a05eaf2 100644
--- a/Documentation/webkitgtk/tmpl/webkitspellchecker.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitspellchecker.sgml
@@ -9,11 +9,13 @@ WebKitSpellChecker
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitviewportattributes.sgml b/Documentation/webkitgtk/tmpl/webkitviewportattributes.sgml
index 292daf2..2ea02b4 100644
--- a/Documentation/webkitgtk/tmpl/webkitviewportattributes.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitviewportattributes.sgml
@@ -9,11 +9,13 @@ WebKitViewportAttributes
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebbackforwardlist.sgml b/Documentation/webkitgtk/tmpl/webkitwebbackforwardlist.sgml
index 5c74ed4..06bd170 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebbackforwardlist.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebbackforwardlist.sgml
@@ -9,11 +9,13 @@ WebKitWebBackForwardList
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebdatabase.sgml b/Documentation/webkitgtk/tmpl/webkitwebdatabase.sgml
index 227766e..dba16ce 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebdatabase.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebdatabase.sgml
@@ -9,11 +9,13 @@ WebKitWebDatabase
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebdatasource.sgml b/Documentation/webkitgtk/tmpl/webkitwebdatasource.sgml
index 199d606..9becb5f 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebdatasource.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebdatasource.sgml
@@ -9,11 +9,13 @@ WebKitWebDataSource
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebframe.sgml b/Documentation/webkitgtk/tmpl/webkitwebframe.sgml
index 60195f1..616c7d0 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebframe.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebframe.sgml
@@ -9,11 +9,13 @@ WebKitWebFrame
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebhistoryitem.sgml b/Documentation/webkitgtk/tmpl/webkitwebhistoryitem.sgml
index f40c9fc..0dbf76f 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebhistoryitem.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebhistoryitem.sgml
@@ -9,11 +9,13 @@ WebKitWebHistoryItem
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebinspector.sgml b/Documentation/webkitgtk/tmpl/webkitwebinspector.sgml
index 4393485..7eac4de 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebinspector.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebinspector.sgml
@@ -9,11 +9,13 @@ WebKitWebInspector
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebnavigationaction.sgml b/Documentation/webkitgtk/tmpl/webkitwebnavigationaction.sgml
index 8c2551e..8fcb588 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebnavigationaction.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebnavigationaction.sgml
@@ -9,11 +9,13 @@ WebKitWebNavigationAction
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebplugin.sgml b/Documentation/webkitgtk/tmpl/webkitwebplugin.sgml
index 1b31370..3704327 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebplugin.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebplugin.sgml
@@ -9,11 +9,13 @@ WebKitWebPlugin
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebplugindatabase.sgml b/Documentation/webkitgtk/tmpl/webkitwebplugindatabase.sgml
index f733579..17ffe44 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebplugindatabase.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebplugindatabase.sgml
@@ -9,11 +9,13 @@ WebKitWebPluginDatabase
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebpolicydecision.sgml b/Documentation/webkitgtk/tmpl/webkitwebpolicydecision.sgml
index ac0e6e1..fac97d3 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebpolicydecision.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebpolicydecision.sgml
@@ -9,11 +9,13 @@ WebKitWebPolicyDecision
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebresource.sgml b/Documentation/webkitgtk/tmpl/webkitwebresource.sgml
index 0734d3a..4a8ed9e 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebresource.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebresource.sgml
@@ -9,11 +9,13 @@ WebKitWebResource
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebsettings.sgml b/Documentation/webkitgtk/tmpl/webkitwebsettings.sgml
index 5f250b5..8cba607 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebsettings.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebsettings.sgml
@@ -9,11 +9,13 @@ WebKitWebSettings
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebview.sgml b/Documentation/webkitgtk/tmpl/webkitwebview.sgml
index f89eaf7..b0ba10b 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebview.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebview.sgml
@@ -9,11 +9,13 @@ WebKitWebView
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/Documentation/webkitgtk/tmpl/webkitwebwindowfeatures.sgml b/Documentation/webkitgtk/tmpl/webkitwebwindowfeatures.sgml
index 8eccdac..c373544 100644
--- a/Documentation/webkitgtk/tmpl/webkitwebwindowfeatures.sgml
+++ b/Documentation/webkitgtk/tmpl/webkitwebwindowfeatures.sgml
@@ -9,11 +9,13 @@ WebKitWebWindowFeatures
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 26efe9f..8eeb9ff 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -349,8 +349,3 @@ if ENABLE_WEBKIT2
 	@-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
 	@cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
 endif
-
-# Parallel builds are broken at the moment:
-# https://bugs.webkit.org/show_bug.cgi?id=79498
-# http://savannah.gnu.org/bugs/?30653
-.NOTPARALLEL:
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 06214f2..64d602d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -80638,8 +80638,3 @@ doc-dist-hook: docs-build.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# Parallel builds are broken at the moment:
-# https://bugs.webkit.org/show_bug.cgi?id=79498
-# http://savannah.gnu.org/bugs/?30653
-.NOTPARALLEL:
diff --git a/NEWS b/NEWS
index 3574094..ec8018e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
 =================
+WebKitGTK+ 1.10.0
+=================
+
+What's new in WebKitGTK+ 1.10.0?
+
+  - Make WebKitWebView work again inside a GtkOverlay in WebKit2 by
+    not using a native window for Accelerated Compositing
+    implementation.
+
+=================
 WebKitGTK+ 1.9.92
 =================
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8090100..a5df6ee 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,38 @@
+2012-09-19  Carlos Garcia Campos  <cgarcia igalia com>
+
+        [GTK] REGRESSION(r128907): it broke several WebKit2 API tests
+        https://bugs.webkit.org/show_bug.cgi?id=97092
+
+        Reviewed by Martin Robinson.
+
+        Calling resizeLater() from the constructor of
+        RedirectedXCompositeWindow can cause the callback to be called
+        later by the main loop after the RedirectedXCompositeWindow object
+        has been destroyed. Instead of calling resizeLater(), initialize
+        the usable size to the given initial size.
+
+        * platform/gtk/RedirectedXCompositeWindow.cpp:
+        (WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
+
+2012-09-18  Martin Robinson  <mrobinson igalia com>
+
+        [GTK] [WebKit2] Use XComposite window for accelerated compositing
+        https://bugs.webkit.org/show_bug.cgi?id=94417
+
+        Reviewed by Carlos Garcia Campos.
+
+        Instead of rendering directly to the widget's native window, render to an
+        offscreen window redirected to a Pixmap with XComposite.
+
+        No new tests. This will be covered by the existing accelerated compositing tests,
+        which should now give correct pixel results.
+
+        * platform/gtk/RedirectedXCompositeWindow.cpp:
+        (WebCore::RedirectedXCompositeWindow::resize): Add a call to XFlush which ensures
+        that pending X11 operations complete.
+        * platform/gtk/RedirectedXCompositeWindow.h:
+        (WebCore::RedirectedXCompositeWindow::windowId): Added this accessor.
+
 2012-09-10  Joanmarie Diggs  <jdiggs igalia com>
 
         Properly expose <legend> elements to ATs
diff --git a/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp b/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp
index ae1d262..88ba6a8 100644
--- a/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp
+++ b/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp
@@ -43,7 +43,8 @@ PassOwnPtr<RedirectedXCompositeWindow> RedirectedXCompositeWindow::create(const
 }
 
 RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize& size)
-    : m_window(0)
+    : m_usableSize(size)
+    , m_window(0)
     , m_parentWindow(0)
     , m_pixmap(0)
     , m_surface(0)
@@ -90,7 +91,6 @@ RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize& size)
     XCompositeRedirectWindow(display, m_window, CompositeRedirectManual);
 
     resize(size);
-    resizeLater(); // Force update of the usable area.
 }
 
 RedirectedXCompositeWindow::~RedirectedXCompositeWindow()
@@ -136,6 +136,8 @@ void RedirectedXCompositeWindow::resize(const IntSize& size)
 
     Display* display = GLContextGLX::sharedDisplay();
     XResizeWindow(display, m_window, size.width(), size.height());
+
+    XFlush(display);
     glXWaitX();
 
     // This swap is based on code in Chromium. It tries to work-around a bug in the Intel drivers
diff --git a/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h b/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
index 39ec7ed..6b97642 100644
--- a/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
+++ b/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
@@ -47,6 +47,7 @@ public:
     void resize(const IntSize& newSize);
     GLContext* context();
     cairo_surface_t* cairoSurfaceForWidget(GtkWidget*);
+    Window windowId() { return m_window; }
 
 private:
     RedirectedXCompositeWindow(const IntSize&);
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 7ba53f8..6df403a 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Carlos Garcia Campos  <cgarcia igalia com>
+
+        Unreviewed. Update NEWS and configure.ac for 1.9.92 release
+
+        * NEWS: Added release notes for 1.9.92.
+
 2012-09-04  Joanmarie Diggs  <jdiggs igalia com>
 
         [GTK] Crash in AccessibilityObject::accessibilityPlatformIncludesObject()
diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
index 3574094..ec8018e 100644
--- a/Source/WebKit/gtk/NEWS
+++ b/Source/WebKit/gtk/NEWS
@@ -1,4 +1,14 @@
 =================
+WebKitGTK+ 1.10.0
+=================
+
+What's new in WebKitGTK+ 1.10.0?
+
+  - Make WebKitWebView work again inside a GtkOverlay in WebKit2 by
+    not using a native window for Accelerated Compositing
+    implementation.
+
+=================
 WebKitGTK+ 1.9.92
 =================
 
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
index f5bd2dd..f506942 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
@@ -67,7 +67,7 @@
 #endif
 
 #if USE(TEXTURE_MAPPER_GL) && defined(GDK_WINDOWING_X11)
-#include <gdk/gdkx.h>
+#include <WebCore/RedirectedXCompositeWindow.h>
 #endif
 
 using namespace WebKit;
@@ -89,14 +89,20 @@ struct _WebKitWebViewBasePrivate {
     IntSize resizerSize;
     GRefPtr<AtkObject> accessible;
     bool needsResizeOnMap;
-#if ENABLE(FULLSCREEN_API)
-    bool fullScreenModeActive;
-    WebFullScreenClientGtk fullScreenClient;
-#endif
     GtkWidget* inspectorView;
     unsigned inspectorViewHeight;
     GOwnPtr<GdkEvent> contextMenuEvent;
     WebContextMenuProxyGtk* activeContextMenuProxy;
+
+#if ENABLE(FULLSCREEN_API)
+    bool fullScreenModeActive;
+    WebFullScreenClientGtk fullScreenClient;
+#endif
+
+#if USE(TEXTURE_MAPPER_GL)
+    OwnPtr<RedirectedXCompositeWindow> redirectedWindow;
+    bool readyToRenderAcceleratedCompositingResults;
+#endif
 };
 
 G_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
@@ -161,9 +167,6 @@ static void webkitWebViewBaseRealize(GtkWidget* widget)
     gint attributesMask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
 
     GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributesMask);
-#if USE(TEXTURE_MAPPER_GL)
-    gdk_window_ensure_native(window);
-#endif
     gtk_widget_set_window(widget, window);
     gdk_window_set_user_data(window, widget);
 
@@ -263,7 +266,6 @@ static void webkit_web_view_base_init(WebKitWebViewBase* webkitWebViewBase)
     priv->shouldForwardNextKeyEvent = FALSE;
 
     GtkWidget* viewWidget = GTK_WIDGET(webkitWebViewBase);
-    gtk_widget_set_double_buffered(viewWidget, FALSE);
     gtk_widget_set_can_focus(viewWidget, TRUE);
     priv->imContext = adoptGRef(gtk_im_multicontext_new());
 
@@ -274,11 +276,38 @@ static void webkit_web_view_base_init(WebKitWebViewBase* webkitWebViewBase)
     gtk_drag_dest_set(viewWidget, static_cast<GtkDestDefaults>(0), 0, 0,
                       static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
     gtk_drag_dest_set_target_list(viewWidget, PasteboardHelper::defaultPasteboardHelper()->targetList());
+
+#if USE(TEXTURE_MAPPER_GL)
+    priv->redirectedWindow = RedirectedXCompositeWindow::create(IntSize(1, 1));
+    priv->readyToRenderAcceleratedCompositingResults = false;
+#endif
+}
+
+#if USE(TEXTURE_MAPPER_GL)
+static bool webkitWebViewRenderAcceleratedCompositingResults(WebKitWebViewBase* webViewBase, DrawingAreaProxyImpl* drawingArea, cairo_t* cr, GdkRectangle* clipRect)
+{
+    if (!drawingArea->isInAcceleratedCompositingMode())
+        return false;
+
+    // To avoid flashes when initializing accelerated compositing for the first
+    // time, we wait until we know there's a frame ready before rendering.
+    WebKitWebViewBasePrivate* priv = webViewBase->priv;
+    if (!priv->readyToRenderAcceleratedCompositingResults)
+        return false;
+
+    ASSERT(priv->redirectedWindow);
+    cairo_rectangle(cr, clipRect->x, clipRect->y, clipRect->width, clipRect->height);
+    cairo_surface_t* surface = priv->redirectedWindow->cairoSurfaceForWidget(GTK_WIDGET(webViewBase));
+    cairo_set_source_surface(cr, surface, 0, 0);
+    cairo_fill(cr);
+    return true;
 }
+#endif
 
 static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
 {
-    DrawingAreaProxy* drawingArea = WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy->drawingArea();
+    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
+    DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webViewBase->priv->pageProxy->drawingArea());
     if (!drawingArea)
         return FALSE;
 
@@ -286,8 +315,13 @@ static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
     if (!gdk_cairo_get_clip_rectangle(cr, &clipRect))
         return FALSE;
 
+#if USE(TEXTURE_MAPPER_GL)
+    if (webkitWebViewRenderAcceleratedCompositingResults(webViewBase, drawingArea, cr, &clipRect))
+        return FALSE;
+#endif
+
     WebCore::Region unpaintedRegion; // This is simply unused.
-    static_cast<DrawingAreaProxyImpl*>(drawingArea)->paint(cr, clipRect, unpaintedRegion);
+    drawingArea->paint(cr, clipRect, unpaintedRegion);
 
     return FALSE;
 }
@@ -308,7 +342,7 @@ static void webkitWebViewBaseChildAllocate(GtkWidget* child, gpointer userData)
     priv->children.set(child, IntRect());
 }
 
-static void resizeWebKitWebViewBaseFromAllocation(WebKitWebViewBase* webViewBase, GtkAllocation* allocation)
+static void resizeWebKitWebViewBaseFromAllocation(WebKitWebViewBase* webViewBase, GtkAllocation* allocation, bool sizeChanged)
 {
     gtk_container_foreach(GTK_CONTAINER(webViewBase), webkitWebViewBaseChildAllocate, webViewBase);
 
@@ -323,6 +357,11 @@ static void resizeWebKitWebViewBaseFromAllocation(WebKitWebViewBase* webViewBase
         viewRect.setHeight(allocation->height - priv->inspectorViewHeight);
     }
 
+#if USE(TEXTURE_MAPPER_GL)
+    if (sizeChanged)
+        webViewBase->priv->redirectedWindow->resize(viewRect.size());
+#endif
+
     if (priv->pageProxy->drawingArea())
         priv->pageProxy->drawingArea()->setSize(viewRect.size(), IntSize());
 
@@ -333,14 +372,18 @@ static void resizeWebKitWebViewBaseFromAllocation(WebKitWebViewBase* webViewBase
 
 static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
 {
+    bool sizeChanged = gtk_widget_get_allocated_width(widget) != allocation->width
+                       || gtk_widget_get_allocated_height(widget) != allocation->height;
+
     GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->size_allocate(widget, allocation);
 
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
-    if (!gtk_widget_get_mapped(GTK_WIDGET(webViewBase)) && !webViewBase->priv->pageProxy->drawingArea()->size().isEmpty()) {
+    if (sizeChanged && !gtk_widget_get_mapped(widget) && !webViewBase->priv->pageProxy->drawingArea()->size().isEmpty()) {
         webViewBase->priv->needsResizeOnMap = true;
         return;
     }
-    resizeWebKitWebViewBaseFromAllocation(webViewBase, allocation);
+
+    resizeWebKitWebViewBaseFromAllocation(webViewBase, allocation, sizeChanged);
 }
 
 static void webkitWebViewBaseMap(GtkWidget* widget)
@@ -348,19 +391,12 @@ static void webkitWebViewBaseMap(GtkWidget* widget)
     GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->map(widget);
 
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
-#if USE(TEXTURE_MAPPER_GL) && defined(GDK_WINDOWING_X11)
-    GdkWindow* gdkWindow = gtk_widget_get_window(widget);
-    ASSERT(gdkWindow);
-    if (gdk_window_has_native(gdkWindow))
-        webViewBase->priv->pageProxy->widgetMapped(GDK_WINDOW_XID(gdkWindow));
-#endif
-
     if (!webViewBase->priv->needsResizeOnMap)
         return;
 
     GtkAllocation allocation;
     gtk_widget_get_allocation(widget, &allocation);
-    resizeWebKitWebViewBaseFromAllocation(webViewBase, &allocation);
+    resizeWebKitWebViewBaseFromAllocation(webViewBase, &allocation, true /* sizeChanged */);
     webViewBase->priv->needsResizeOnMap = false;
 }
 
@@ -675,6 +711,10 @@ void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WKCont
 #if ENABLE(FULLSCREEN_API)
     priv->pageProxy->fullScreenManager()->setWebView(webkitWebViewBase);
 #endif
+
+#if USE(TEXTURE_MAPPER_GL)
+    priv->pageProxy->setAcceleratedCompositingWindowId(priv->redirectedWindow->windowId());
+#endif
 }
 
 void webkitWebViewBaseSetTooltipText(WebKitWebViewBase* webViewBase, const char* tooltip)
@@ -793,3 +833,38 @@ GdkEvent* webkitWebViewBaseTakeContextMenuEvent(WebKitWebViewBase* webkitWebView
 {
     return webkitWebViewBase->priv->contextMenuEvent.release();
 }
+
+#if USE(TEXTURE_MAPPER_GL)
+static gboolean queueAnotherDrawOfAcceleratedCompositingResults(gpointer* webViewBasePointer)
+{
+    // The WebViewBase may have been destroyed in the time since we queued this
+    // draw and the time we are actually executing.
+    if (!*webViewBasePointer) {
+        fastFree(webViewBasePointer);
+        return FALSE;
+    }
+
+    WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(*webViewBasePointer);
+    gtk_widget_queue_draw(GTK_WIDGET(webViewBase));
+    webViewBase->priv->readyToRenderAcceleratedCompositingResults = true;
+
+    g_object_remove_weak_pointer(G_OBJECT(webViewBase), webViewBasePointer);
+    fastFree(webViewBasePointer);
+
+    return FALSE;
+}
+
+void webkitWebViewBaseQueueDrawOfAcceleratedCompositingResults(WebKitWebViewBase* webViewBase)
+{
+    gtk_widget_queue_draw(GTK_WIDGET(webViewBase));
+
+    // Redraw again, one frame later, as it might take some time for the new GL frame to be available.
+    // This prevents the display from always being one frame behind in the case GL hasn't yet finished
+    // rendering to the window.
+    // TODO: Add XDamage support to RedirectedXCompositeWindow to accomplish this.
+    gpointer* webViewBasePointer = static_cast<gpointer*>(fastMalloc(sizeof(gpointer)));
+    g_object_add_weak_pointer(G_OBJECT(webViewBase), webViewBasePointer);
+    *webViewBasePointer = webViewBase;
+    g_timeout_add(1000 / 60, reinterpret_cast<GSourceFunc>(queueAnotherDrawOfAcceleratedCompositingResults), webViewBasePointer);
+}
+#endif
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
index 70cc725..554e1a6 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
@@ -51,4 +51,8 @@ void webkitWebViewBaseSetActiveContextMenuProxy(WebKitWebViewBase*, WebContextMe
 WebContextMenuProxyGtk* webkitWebViewBaseGetActiveContextMenuProxy(WebKitWebViewBase*);
 GdkEvent* webkitWebViewBaseTakeContextMenuEvent(WebKitWebViewBase*);
 
+#if USE(TEXTURE_MAPPER_GL)
+void webkitWebViewBaseQueueDrawOfAcceleratedCompositingResults(WebKitWebViewBase*);
+#endif
+
 #endif // WebKitWebViewBasePrivate_h
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index 0c9f04f..762e35c 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -48,6 +48,10 @@ public:
 
     void paint(BackingStore::PlatformGraphicsContext, const WebCore::IntRect&, WebCore::Region& unpaintedRegion);
 
+#if USE(ACCELERATED_COMPOSITING)
+    bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
+#endif
+
 private:
     explicit DrawingAreaProxyImpl(WebPageProxy*);
 
@@ -78,9 +82,6 @@ private:
     void enterAcceleratedCompositingMode(const LayerTreeContext&);
     void exitAcceleratedCompositingMode();
     void updateAcceleratedCompositingMode(const LayerTreeContext&);
-
-    bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
-
 #if USE(COORDINATED_GRAPHICS)
     virtual void setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, float scale, const WebCore::FloatPoint& trajectory);
     void didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 9a19a56..e557299 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -709,7 +709,8 @@ public:
     virtual NativeWebMouseEvent* currentlyProcessedMouseDownEvent();
 
 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
-    void widgetMapped(uint64_t nativeWindowId);
+    void setAcceleratedCompositingWindowId(uint64_t nativeWindowId);
+    void invalidateWidget();
 #endif
 
     void setSuppressVisibilityUpdates(bool flag) { m_suppressVisibilityUpdates = flag; }
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
index 7fa81be..1078bfe 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -177,6 +177,10 @@ messages -> WebPageProxy {
     BindAccessibilityTree(WTF::String plugID)
 #endif
 
+#if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
+    InvalidateWidget()
+#endif
+
     # BackForward messages
     BackForwardAddItem(uint64_t itemID)
     BackForwardGoToItem(uint64_t itemID) -> (WebKit::SandboxExtension::Handle sandboxExtensionHandle)
diff --git a/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp
index ac26c0c..1117a25 100644
--- a/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp
@@ -110,9 +110,14 @@ void WebPageProxy::windowedPluginGeometryDidChange(const WebCore::IntRect& frame
 }
 
 #if USE(TEXTURE_MAPPER_GL)
-void WebPageProxy::widgetMapped(uint64_t nativeWindowId)
+void WebPageProxy::setAcceleratedCompositingWindowId(uint64_t nativeWindowId)
 {
-    process()->send(Messages::WebPage::WidgetMapped(nativeWindowId), m_pageID);
+    process()->send(Messages::WebPage::SetAcceleratedCompositingWindowId(nativeWindowId), m_pageID);
+}
+
+void WebPageProxy::invalidateWidget()
+{
+    webkitWebViewBaseQueueDrawOfAcceleratedCompositingResults(WEBKIT_WEB_VIEW_BASE(static_cast<PageClientImpl*>(m_pageClient)->viewWidget()));
 }
 #endif
 
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
index 789727a..bb4dd48 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
@@ -456,7 +456,8 @@ public:
     void updateAccessibilityTree();
     bool handleMousePressedEvent(const WebCore::PlatformMouseEvent&);
 #if USE(TEXTURE_MAPPER_GL)
-    void widgetMapped(int64_t nativeWindowHandle);
+    void setAcceleratedCompositingWindowId(int64_t nativeWindowHandle);
+    void invalidateWidget();
 #endif
 #endif
 
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
index e3ff23c..8d8260f 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
@@ -297,6 +297,6 @@ messages -> WebPage {
 #endif
 
 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
-    WidgetMapped(int64_t id)
+    SetAcceleratedCompositingWindowId(int64_t id)
 #endif
 }
diff --git a/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp b/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
index 1b91de8..27b3e55 100644
--- a/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
@@ -201,6 +201,8 @@ void LayerTreeHostGtk::sizeDidChange(const IntSize& newSize)
 
     if (m_pageOverlayLayer)
         m_pageOverlayLayer->setSize(newSize);
+
+    compositeLayersToContext(ForResize);
 }
 
 void LayerTreeHostGtk::deviceScaleFactorDidChange()
@@ -291,7 +293,7 @@ bool LayerTreeHostGtk::flushPendingLayerChanges()
     return m_webPage->corePage()->mainFrame()->view()->syncCompositingStateIncludingSubframes();
 }
 
-void LayerTreeHostGtk::compositeLayersToContext()
+void LayerTreeHostGtk::compositeLayersToContext(CompositePurpose purpose)
 {
     GLContext* context = glContext();
     if (!context || !context->makeContextCurrent())
@@ -303,11 +305,17 @@ void LayerTreeHostGtk::compositeLayersToContext()
     IntSize contextSize = m_context->defaultFrameBufferSize();
     glViewport(0, 0, contextSize.width(), contextSize.height());
 
+    if (purpose == ForResize) {
+        glClearColor(1, 1, 1, 0);
+        glClear(GL_COLOR_BUFFER_BIT);
+    }
+
     m_textureMapper->beginPainting();
     toTextureMapperLayer(m_rootLayer.get())->paint();
     m_textureMapper->endPainting();
 
     context->swapBuffers();
+    m_webPage->invalidateWidget();
 }
 
 void LayerTreeHostGtk::flushAndRenderLayers()
diff --git a/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h b/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
index 060570b..d9a816c 100644
--- a/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
+++ b/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
@@ -83,7 +83,10 @@ private:
 
     void createPageOverlayLayer();
     void destroyPageOverlayLayer();
-    void compositeLayersToContext();
+
+    enum CompositePurpose { ForResize, NotForResize };
+    void compositeLayersToContext(CompositePurpose = NotForResize);
+
     void flushAndRenderLayers();
     void cancelPendingLayerFlush();
 
diff --git a/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp b/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
index 30aaa40..d9dde81 100644
--- a/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
@@ -156,10 +156,15 @@ PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const KURL&)
 }
 
 #if USE(TEXTURE_MAPPER_GL)
-void WebPage::widgetMapped(int64_t nativeWindowHandle)
+void WebPage::setAcceleratedCompositingWindowId(int64_t nativeWindowHandle)
 {
     m_nativeWindowHandle = nativeWindowHandle;
 }
+
+void WebPage::invalidateWidget()
+{
+    send(Messages::WebPageProxy::InvalidateWidget());
+}
 #endif
 
 bool WebPage::handleMousePressedEvent(const PlatformMouseEvent& platformMouseEvent)
diff --git a/configure b/configure
index e447a28..9418a8b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for WebKit 1.9.92.
+# Generated by GNU Autoconf 2.68 for WebKitGTK 1.10.0.
 #
 # Report bugs to <http://bugs.webkit.org/>.
 #
@@ -568,10 +568,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='WebKit'
-PACKAGE_TARNAME='webkit'
-PACKAGE_VERSION='1.9.92'
-PACKAGE_STRING='WebKit 1.9.92'
+PACKAGE_NAME='WebKitGTK'
+PACKAGE_TARNAME='webkitgtk'
+PACKAGE_VERSION='1.10.0'
+PACKAGE_STRING='WebKitGTK 1.10.0'
 PACKAGE_BUGREPORT='http://bugs.webkit.org/'
 PACKAGE_URL=''
 
@@ -1760,7 +1760,7 @@ if test "$ac_init_help" = "long"; then
   # 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 WebKit 1.9.92 to adapt to many kinds of systems.
+\`configure' configures WebKitGTK 1.10.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1808,7 +1808,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/webkit]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/webkitgtk]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1830,7 +1830,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of WebKit 1.9.92:";;
+     short | recursive ) echo "Configuration of WebKitGTK 1.10.0:";;
    esac
   cat <<\_ACEOF
 
@@ -2171,7 +2171,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-WebKit configure 1.9.92
+WebKitGTK configure 1.10.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2715,7 +2715,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by WebKit $as_me 1.9.92, which was
+It was created by WebKitGTK $as_me 1.10.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3172,8 +3172,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 WEBKIT_MAJOR_VERSION=1
-WEBKIT_MINOR_VERSION=9
-WEBKIT_MICRO_VERSION=92
+WEBKIT_MINOR_VERSION=10
+WEBKIT_MICRO_VERSION=0
 WEBKIT_USER_AGENT_MAJOR_VERSION=537
 WEBKIT_USER_AGENT_MINOR_VERSION=6
 
@@ -3184,13 +3184,13 @@ WEBKIT_USER_AGENT_MINOR_VERSION=6
 
 
 
-LIBWEBKITGTK_VERSION=17:2:17
+LIBWEBKITGTK_VERSION=17:3:17
 
 
-LIBJAVASCRIPTCOREGTK_VERSION=13:8:13
+LIBJAVASCRIPTCOREGTK_VERSION=13:9:13
 
 
-LIBWEBKIT2GTK_VERSION=18:2:0
+LIBWEBKIT2GTK_VERSION=18:3:0
 
 
 am__api_version='1.11'
@@ -3630,8 +3630,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='webkit'
- VERSION='1.9.92'
+ PACKAGE='webkitgtk'
+ VERSION='1.10.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24627,7 +24627,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by WebKit $as_me 1.9.92, which was
+This file was extended by WebKitGTK $as_me 1.10.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24693,7 +24693,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-WebKit config.status 1.9.92
+WebKitGTK config.status 1.10.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 7072d4f..03bdb5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.60)
 
 m4_define([webkit_major_version], [1])
-m4_define([webkit_minor_version], [9])
-m4_define([webkit_micro_version], [92])
+m4_define([webkit_minor_version], [10])
+m4_define([webkit_micro_version], [0])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -11,7 +11,7 @@ m4_define([webkit_micro_version], [92])
 m4_define([webkit_user_agent_major_version], [537])
 m4_define([webkit_user_agent_minor_version], [6])
 
-AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
+AC_INIT([WebKitGTK],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
 AC_CONFIG_MACRO_DIR([Source/autotools])
 AC_CONFIG_AUX_DIR([Source/autotools])
@@ -35,13 +35,13 @@ AC_CONFIG_SRCDIR([Source/WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-LIBWEBKITGTK_VERSION=17:2:17
+LIBWEBKITGTK_VERSION=17:3:17
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-LIBJAVASCRIPTCOREGTK_VERSION=13:8:13
+LIBJAVASCRIPTCOREGTK_VERSION=13:9:13
 AC_SUBST([LIBJAVASCRIPTCOREGTK_VERSION])
 
-LIBWEBKIT2GTK_VERSION=18:2:0
+LIBWEBKIT2GTK_VERSION=18:3:0
 AC_SUBST([LIBWEBKIT2GTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]