Commit 7ed87b76 authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Imported Upstream version 2.10.2+dfsg1

parent 8929f222
......@@ -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.10.1</p></div>
<div><p class="releaseinfo">for WebKit2GTK+ 2.10.2</p></div>
</div>
<hr>
</div>
......
......@@ -127,7 +127,7 @@ against at application run time.</p>
<hr>
<div class="refsect2">
<a name="WEBKIT-MICRO-VERSION:CAPS"></a><h3>WEBKIT_MICRO_VERSION</h3>
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (1)
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (2)
</pre>
<p>Like <a class="link" href="webkit2gtk-4.0-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
......
......@@ -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.10.1</p></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.10.2</p></div>
</div>
<hr>
</div>
......
=================
WebKitGTK+ 2.10.2
=================
What's new in WebKitGTK+ 2.10.2?
- Fix a regression introduced in 2.10.1 that disabled accelerated compositing.
- Fix build with cmake 3.4.
=================
WebKitGTK+ 2.10.1
=================
......
......@@ -4638,6 +4638,7 @@ static Editor::Command command(Document* document, const String& commandName, bo
bool Document::execCommand(const String& commandName, bool userInterface, const String& value)
{
EventQueueScope eventQueueScope;
return command(this, commandName, userInterface).execute(value);
}
......
......@@ -43,7 +43,7 @@ void WebPreferences::platformInitializeStore()
setPluginsEnabled(false);
}
#endif
#if !ENABLE(OPEN_GL)
#if !ENABLE(OPENGL)
setAcceleratedCompositingEnabled(false);
#endif
}
......
=================
WebKitGTK+ 2.10.2
=================
What's new in WebKitGTK+ 2.10.2?
- Fix a regression introduced in 2.10.1 that disabled accelerated compositing.
- Fix build with cmake 3.4.
=================
WebKitGTK+ 2.10.1
=================
......
......@@ -59,6 +59,7 @@ if (OPENGL_FOUND)
include(CMakePushCheckState)
CMAKE_PUSH_CHECK_STATE()
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS})
include(CheckIncludeFiles)
check_include_files("GL/glx.h" GLX_FOUND)
CMAKE_POP_CHECK_STATE()
endif ()
......@@ -35,6 +35,7 @@ pkg_check_modules(WEBP libwebp)
if (NOT(WEBP_FOUND))
# Older installations of libwebp do not install a pkgconfig file, so we fall
# back to a manual search for a libwebp header file.
include(CheckIncludeFiles)
check_include_files("webp/decode.h" WEBP_FOUND_HEADER)
if (WEBP_FOUND_HEADER)
set(WEBP_LIBRARIES "-lwebp")
......
......@@ -2,7 +2,7 @@ include(GNUInstallDirs)
set(PROJECT_VERSION_MAJOR 2)
set(PROJECT_VERSION_MINOR 10)
set(PROJECT_VERSION_MICRO 1)
set(PROJECT_VERSION_MICRO 2)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
set(WEBKITGTK_API_VERSION 4.0)
......@@ -15,8 +15,8 @@ endif ()
# Libtool library version, not to be confused with API version.
# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 4 11)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 20 9 2)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 5 11)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 20 10 2)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
......
......@@ -190,6 +190,8 @@ static gboolean permissionRequestCallback(WebKitWebView*, WebKitPermissionReques
g_assert(webkit_install_missing_media_plugins_permission_request_get_description(missingPluginsRequest));
webkit_permission_request_deny(request);
test->quitMainLoop();
return TRUE;
}
static void testInstallMissingPluginsPermissionRequest(WebViewTest* test, gconstpointer)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment