summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/gtk
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-25 19:08:45 +0100
committerSteve Block <steveblock@google.com>2011-06-08 13:51:31 +0100
commit2bde8e466a4451c7319e3a072d118917957d6554 (patch)
tree28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit/gtk
parent6939c99b71d9372d14a0c74a772108052e8c48c8 (diff)
downloadexternal_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip
external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz
external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit/gtk')
-rw-r--r--Source/WebKit/gtk/ChangeLog334
-rw-r--r--Source/WebKit/gtk/GNUmakefile.am2
-rw-r--r--Source/WebKit/gtk/NEWS51
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp8
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h2
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp40
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h3
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp10
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h4
-rw-r--r--Source/WebKit/gtk/WebCoreSupport/TextCheckerClientEnchant.cpp27
-rw-r--r--Source/WebKit/gtk/po/ChangeLog8
-rw-r--r--Source/WebKit/gtk/po/it.po947
-rw-r--r--Source/WebKit/gtk/tests/testapplicationcache.c21
-rw-r--r--Source/WebKit/gtk/tests/testatk.c23
-rw-r--r--Source/WebKit/gtk/tests/testdomdomwindow.c6
-rw-r--r--Source/WebKit/gtk/tests/testwebview.c5
-rw-r--r--Source/WebKit/gtk/webkit/webkit.h1
-rw-r--r--Source/WebKit/gtk/webkit/webkitapplicationcache.cpp28
-rw-r--r--Source/WebKit/gtk/webkit/webkitapplicationcache.h7
-rw-r--r--Source/WebKit/gtk/webkit/webkitdefines.h3
-rw-r--r--Source/WebKit/gtk/webkit/webkitglobals.cpp45
-rw-r--r--Source/WebKit/gtk/webkit/webkitglobals.h3
-rw-r--r--Source/WebKit/gtk/webkit/webkitglobalsprivate.h1
-rw-r--r--Source/WebKit/gtk/webkit/webkiticondatabase.cpp317
-rw-r--r--Source/WebKit/gtk/webkit/webkiticondatabase.h78
-rw-r--r--Source/WebKit/gtk/webkit/webkitviewportattributes.cpp2
-rw-r--r--Source/WebKit/gtk/webkit/webkitwebframe.cpp17
-rw-r--r--Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp3
-rw-r--r--Source/WebKit/gtk/webkit/webkitwebsettings.cpp31
-rw-r--r--Source/WebKit/gtk/webkit/webkitwebview.cpp63
-rw-r--r--Source/WebKit/gtk/webkit/webkitwebview.h3
31 files changed, 1653 insertions, 440 deletions
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index d5cfb4d..88452c2 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,337 @@
+2011-03-30 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Dirk Schulze.
+
+ [Cairo] Better separate the concerns of GraphicsContextCairo
+ https://bugs.webkit.org/show_bug.cgi?id=55150
+
+ Add a PlatformContextCairo which right now stores the cairo_t* for a
+ GraphicsContextCairo. Later patches will move logic for tracking ContextShadow
+ and image masking layers into this PlatformContextCairo class.
+
+ * webkit/webkitwebframe.cpp:
+ (draw_page_callback):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_expose_event):
+ (webkit_web_view_draw):
+
+2011-03-29 Philippe Normand <pnormand@igalia.com>
+
+ Unreviewed, disable an assert in testwebview due to
+ https://bugs.webkit.org/show_bug.cgi?id=57315
+
+ * tests/testwebview.c:
+
+2011-03-28 Adele Peterson <adele@apple.com>
+
+ Build fix.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker):
+
+2011-03-28 Sergio Villar Senin <svillar@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Fullscreen tests failing after r82084
+ https://bugs.webkit.org/show_bug.cgi?id=57219
+
+ Added the withKeyboard parameter to supportsFullScreenForElement
+ method in ChromeClient. Fullscreen will be disabled for keyboard
+ access by default.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::supportsFullScreenForElement):
+ * WebCoreSupport/ChromeClientGtk.h:
+
+2011-03-25 Andy Estes <aestes@apple.com>
+
+ Reviewed by Adele Peterson.
+
+ REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+ https://bugs.webkit.org/show_bug.cgi?id=49016
+
+ Update objectContentType() implementation to handle the
+ shouldPreferPlugInsForImages flag.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::objectContentType):
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+
+2011-03-25 Priit Laes <plaes@plaes.org>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] [PATCH] Avoid critical warning when free-ing list of plugins
+ https://bugs.webkit.org/show_bug.cgi?id=57025
+
+ * webkit/webkitwebplugindatabase.cpp:
+ (webkit_web_plugin_database_plugins_list_free):
+ Use regular check and return instead of g_return_if_fail.
+
+2011-03-24 Sheriff Bot <webkit.review.bot@gmail.com>
+
+ Unreviewed, rolling out r81916 and r81917.
+ http://trac.webkit.org/changeset/81916
+ http://trac.webkit.org/changeset/81917
+ https://bugs.webkit.org/show_bug.cgi?id=57071
+
+ broke a test on platforms that do not have QuickTime installed
+ (Requested by estes on #webkit).
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::objectContentType):
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+
+2011-03-24 Andy Estes <aestes@apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+ https://bugs.webkit.org/show_bug.cgi?id=49016
+
+ Update objectContentType() implementation to handle the
+ shouldPreferPlugInsForImages flag.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::objectContentType):
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+
+2011-03-23 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Change IconDatabase opening to allow for arbitrary filenames
+ https://bugs.webkit.org/show_bug.cgi?id=56977
+
+ * webkit/webkiticondatabase.cpp:
+ (webkit_icon_database_set_path):
+
+2011-03-22 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ Applications that include WebKit headers fail to build when using strict warnings
+ because the signature for webkit_application_cache_get_maximum_size is missing a
+ 'void' to make it explicit it takes no arguments.
+
+ * webkit/webkitapplicationcache.h:
+
+2011-03-21 Alejandro G. Castro <alex@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] 1.3.13 release bump
+ https://bugs.webkit.org/show_bug.cgi?id=56795
+
+ Version bump for 1.3.13 and updated NEWS file with release notes.
+
+ * NEWS:
+
+2011-03-21 Chang Shu <cshu@webkit.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ REGRESSION (r79953): Can't type in MS Outlook 2011
+ https://bugs.webkit.org/show_bug.cgi?id=56665
+
+ r79953 removed the WebView level editablity which is persistent no matter whether
+ underlying document itself is changed and editability gets lost. The resolution is to
+ set this WebView editable value to WebCore. This avoids the callback from WebCore to
+ WebKit which was the main goal in r79953 to improve performance.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_get_editable):
+ (webkit_web_view_set_editable):
+
+2011-03-21 Mario Sanchez Prada <msanchez@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] [Stable] AtkHypertext exposes wrong offsets for links placed inside <span> nodes
+ https://bugs.webkit.org/show_bug.cgi?id=56737
+
+ * tests/testatk.c:
+ (testWebkitAtkHypertextAndHyperlinks): Updated unit test to also
+ check offsets for hyperlinks inside <span> nodes.
+
+2011-03-18 David Keijser <keijser@gmail.com> and Xan Lopez <xlopez@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] On-demand event-listeners for DOM event signals
+ https://bugs.webkit.org/show_bug.cgi?id=49649
+
+ * tests/testdomdomwindow.c: update unit tests for new APIs.
+ (load_event_callback): ditto.
+ (test_dom_domview_signals): ditto.
+ (load_status_callback): ditto.
+
+2011-03-17 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Sam Weinig.
+
+ https://bugs.webkit.org/show_bug.cgi?id=56425
+ More groundwork for WebKit2 IconDatabase
+
+ Update already-used function names:
+ * webkit/webkiticondatabase.cpp:
+ (webkit_icon_database_get_icon_uri):
+ (webkit_icon_database_get_icon_pixbuf):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_get_icon_uri):
+
+2011-03-16 Joseph Pecoraro <joepeck@webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Viewport no longer allows an auto value for "user-scalable"
+ https://bugs.webkit.org/show_bug.cgi?id=55416
+
+ Make the default value for userScalable be true.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::dumpConfigurationForViewport): update test output to include userScalable.
+ * webkit/webkitviewportattributes.cpp:
+ (webkitViewportAttributesRecompute):
+
+2011-03-15 Ilya Sherman <isherman@chromium.org>
+
+ Reviewed by Tony Chang.
+
+ Autofilled form elements are assigned fixed background color but not text color
+ https://bugs.webkit.org/show_bug.cgi?id=48382
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setAutofilled): Added.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
+2011-03-14 Ryuan Choi <ryuan.choi@samsung.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Possible leaks after splitting TextCheckerClientEnchant.
+ https://bugs.webkit.org/show_bug.cgi?id=55989
+
+ Convert gchar* to GOwnPtr<gchar> and refactor the code.
+
+ * WebCoreSupport/TextCheckerClientEnchant.cpp:
+ (WebKit::TextCheckerClientEnchant::checkSpellingOfString):
+
+2011-03-11 Marco Peereboom <marco@peereboom.us>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Provide a knob to enable/disable DNS prefetching.
+ DNS prefetching is enabled by default.
+ https://bugs.webkit.org/show_bug.cgi?id=55973
+
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ (webkit_web_settings_copy):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
+2011-03-08 Philippe Normand <pnormand@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] close-web-view emitted on disposed WebView
+ https://bugs.webkit.org/show_bug.cgi?id=55932
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (ChromeClient::chromeDestroyed): Remove the closeSoonTimer glib
+ source before destruction of the ChromeClient.
+
+2011-03-11 Roland Steiner <rolandsteiner@chromium.org>
+
+ Reviewed by Ryosuke Niwa.
+
+ Bug 55570 - Remove dependency of dom/InputElement.cpp on html/ and wml/
+ https://bugs.webkit.org/show_bug.cgi?id=55570
+
+ Add a virtual function toInputElement() to Node that has a default
+ implementation of returning 0.
+ For HTMLInputElement and WMLInputElement (which derive from InputElement)
+ override this to return the object.
+ Change all calling sites of the old toInputElement to use the new member
+ function. This also allows us to save some casts.
+
+ No new tests (refactoring).
+
+ * src/WebInputElement.cpp:
+ (WebKit::toWebInputElement):
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setValueForUser):
+
+2011-03-10 Philippe Normand <pnormand@igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] unittests/testapplicationcache crashes
+ https://bugs.webkit.org/show_bug.cgi?id=56083
+
+ Removed the webkit_application_cache_get_database_directory_path
+ API as the underlying ApplicationCacheStorage doesn't allow
+ setting the cache path multiple times.
+
+ * tests/testapplicationcache.c:
+ (main):
+ * webkit/webkitapplicationcache.cpp:
+ (webkit_application_cache_get_database_directory_path):
+ * webkit/webkitapplicationcache.h:
+ * webkit/webkitglobals.cpp:
+ (webkitInit):
+
+2011-03-09 Peter Kasting <pkasting@google.com>
+
+ Reviewed by Mihai Parparita.
+
+ Unify Windows version checks.
+ https://bugs.webkit.org/show_bug.cgi?id=55979
+
+ * webkit/webkitwebsettings.cpp:
+ (webkitOSVersion):
+
+2011-03-08 Christian Dywan <christian@lanedo.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] provide an API to control the IconDatabase
+ https://bugs.webkit.org/show_bug.cgi?id=32510
+
+ * GNUmakefile.am:
+ * WebCoreSupport/FrameLoaderClientGtk.cpp: Emit signals on
+ the icon database for new icons.
+ * webkit/webkit.h:
+ * webkit/webkitdefines.h:
+ * webkit/webkitglobals.cpp:
+ * webkit/webkitglobals.h: Add a function to obtain the global
+ icon database.
+ * webkit/webkiticondatabase.cpp:
+ * webkit/webkiticondatabase.h: Implement public icon database
+ object with methods for obtaining icon URLs, pixbufs, clearing
+ waiting for new icons.
+ * webkit/webkitwebview.cpp:
+ * webkit/webkitwebview.h: Add a method to obtain an icon pixbuf
+ for the web view.
+2011-03-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Add layoutTestController.setValueForUser() after r80412
+ https://bugs.webkit.org/show_bug.cgi?id=55862
+
+ Add setValueForUser method to DumpRenderTreeSupportGTK.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setValueForUser):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
2011-03-07 Sam Weinig <sam@webkit.org>
Reviewed by Anders Carlsson.
diff --git a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
index 42ac1e4..7030ea8 100644
--- a/Source/WebKit/gtk/GNUmakefile.am
+++ b/Source/WebKit/gtk/GNUmakefile.am
@@ -116,6 +116,7 @@ webkitgtk_static_h_api += \
$(srcdir)/Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitglobals.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkithittestresult.h \
+ $(srcdir)/Source/WebKit/gtk/webkit/webkiticondatabase.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitnetworkrequest.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitnetworkresponse.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitsecurityorigin.h \
@@ -203,6 +204,7 @@ webkitgtk_sources += \
Source/WebKit/gtk/webkit/webkitglobalsprivate.h \
Source/WebKit/gtk/webkit/webkithittestresult.cpp \
Source/WebKit/gtk/webkit/webkithittestresultprivate.h \
+ Source/WebKit/gtk/webkit/webkiticondatabase.cpp \
Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp \
Source/WebKit/gtk/webkit/webkitnetworkrequestprivate.h \
Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp \
diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
index a7e4581..c847f01 100644
--- a/Source/WebKit/gtk/NEWS
+++ b/Source/WebKit/gtk/NEWS
@@ -1,4 +1,55 @@
=================
+WebKitGTK+ 1.3.13
+=================
+
+What's new in WebKitGTK+ 1.3.13?
+
+In this release the GObject DOM Bindings contain a major change. Explicit
+invocation of DOM objects' addEventListener methods has replaced the GObject
+signal method of DOM event handling. For intance, where before a developer
+would connect to the "click-event" signal, a developer must now call:
+webkit_dom_event_target_add_event_listener. For a more illustrative example see:
+http://trac.webkit.org/changeset/81486/trunk/Source/WebKit/gtk/tests/testdomdomwindow.c
+
+Added API to control the IconDatabase and the cache database APIs.
+
+WebKit bugs mostly relevant with the GTK+ port fixed since 1.3.12:
+
+Bug 23526 - [CAIRO] Support ImageBuffers clip operation on all Cairo ports (Martin Robinson)
+Bug 56180 - [GTK] JSC crashes in 32bit Release bots after r80743 (Martin Robinson)
+Bug 56180 - [GTK] JSC crashes in 32bit Release bots after r80743 (Geoffrey Garen)
+Bug 49649 - [GTK] On-demand event-listeners for DOM event signals (David Keijser)
+Bug 56333 - [GTK] [WebKit2] The UIProcess never changes the mouse cursor (Martin Robinson)
+Bug 55989 - [GTK] Possible leaks after splitting TextCheckerClientEnchant. (Ryuan Choi)
+Bug 50497 - Add all web audio auto-generated files to GTK make system (Chris Rogers)
+Bug 56180 - [GTK] JSC crashes in 32bit Release bots after r80743 (Sergio Villar Senin)
+Bug 55932 - [GTK] close-web-view emitted on disposed WebView (Philippe Normand)
+Bug 53098 - [GTK] Implement spin buttons for GTK+ 2.x (Martin Robinson)
+Bug 56125 - [GTK] [Webkit2] There are no scrollbars visible in the MiniBrowser (Martin Robinson)
+Bug 41903 - [GTK] plugins/return-negative-one-from-write.html crashes (Martin Robinson)
+Bug 32510 - [GTK] provide an API to control the IconDatabase (Christian Dywan)
+Bug 55868 - [GTK] Do not set juntion sides on scrollbar stepper buttons (Carlos Garcia Campos)
+Bug 55866 - [GTK] Use doubles instead of integers for coordinates when rendering arrows (Carlos Garcia Campos)
+Bug 55878 - [Gtk] toDataURL uses incorrect quality value when saving GdkPixbuf to buffer (Zan Dobersek)
+Bug 55531 - [GTK] Windowless plugins override the view cursor (Martin Robinson)
+Bug 55136 - Enable Copy Image Address context menu item in the Gtk port (Christian Dywan)
+Bug 53960 - [GTK] DRT needs implementation of EventSender.scheduleAsynchronousClick (Carlos Garcia Campos)
+Bug 55335 - [GTK] Extended application cache database API and added unit tests file. (Lukasz Slachciak)
+Bug 53146 - [GTK] Combo boxes should emit object:selection-changed even when collapsed (Mario Sanchez Prada)
+Bug 55473 - [GTK] Add support for external protocol handlers (Sergio Villar Senin)
+Bug 53228 - [Gtk] Resource size is incorrectly reported to WebCore (Sergio Villar Senin)
+Bug 48510 - [GTK] Implement WebContext and NativeKeyboardEvent classes for WebKit2 (Amruth Raj)
+Bug 48509 - [GTK] Implement WebView and WebKitWebView classes for WebKit2 (Amruth Raj)
+Bug 48510 - [GTK] Implement WebEventFactory, WebErrors classes for WebKit2 ( Amruth Raj)
+Bug 54658 - [gtk] Failing collinear arcTo canvas tests (Zan Dobersek)
+Bug 37769 - [Gtk] Flash item placed on wrong location right after load (Martin Robinson)
+Bug 54981 - [GTK] position:fixed elements flicker while scrolling after r74196 (Martin Robinson)
+Bug 56180 - [GTK] JSC crashes in 32bit Release bots after r80743 (Oliver Hunt)
+Bug 56737 - [GTK] [Stable] AtkHypertext exposes wrong offsets for links placed inside <span> nodes (Mario Sanchez Prada)
+Bug 56201 - WebKitIconDatabase may trigger crash in cairoImageSurfaceToGdkPixbuf (Christian Dywan)
+Bug 56690 - Stop inserting when the parent is removed (Justin Schuh)
+
+=================
WebKitGTK+ 1.3.12
=================
diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 8e828ac..9f21139 100644
--- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -79,6 +79,9 @@ ChromeClient::ChromeClient(WebKitWebView* webView)
void ChromeClient::chromeDestroyed()
{
+ if (m_closeSoonTimer)
+ g_source_remove(m_closeSoonTimer);
+
delete this;
}
@@ -720,8 +723,11 @@ void ChromeClient::exitFullscreenForNode(Node* node)
#endif
#if ENABLE(FULLSCREEN_API)
-bool ChromeClient::supportsFullScreenForElement(const WebCore::Element* element)
+bool ChromeClient::supportsFullScreenForElement(const WebCore::Element* element, bool withKeyboard)
{
+ if (withKeyboard)
+ return false;
+
return true;
}
diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
index 462ddc4..2bf81eb 100644
--- a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -145,7 +145,7 @@ namespace WebKit {
#endif
#if ENABLE(FULLSCREEN_API)
- virtual bool supportsFullScreenForElement(const WebCore::Element*);
+ virtual bool supportsFullScreenForElement(const WebCore::Element*, bool withKeyboard);
virtual void enterFullScreenForElement(WebCore::Element*);
virtual void exitFullScreenForElement(WebCore::Element*);
#endif
diff --git a/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index 6db2c81..1336f11 100644
--- a/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -34,6 +34,8 @@
#include "FrameView.h"
#include "GCController.h"
#include "GraphicsContext.h"
+#include "HTMLInputElement.h"
+#include "InputElement.h"
#include "JSDOMWindow.h"
#include "JSDocument.h"
#include "JSElement.h"
@@ -98,11 +100,6 @@ bool DumpRenderTreeSupportGtk::linksIncludedInFocusChain()
return s_linksIncludedInTabChain;
}
-void DumpRenderTreeSupportGtk::setIconDatabaseEnabled(bool enabled)
-{
- WebKit::setIconDatabaseEnabled(enabled);
-}
-
void DumpRenderTreeSupportGtk::setSelectTrailingWhitespaceEnabled(bool enabled)
{
s_selectTrailingWhitespaceEnabled = enabled;
@@ -629,7 +626,7 @@ void DumpRenderTreeSupportGtk::dumpConfigurationForViewport(WebKitWebView* webVi
ViewportArguments arguments = webView->priv->corePage->mainFrame()->document()->viewportArguments();
ViewportAttributes attrs = computeViewportAttributes(arguments, /* default layout width for non-mobile pages */ 980, deviceWidth, deviceHeight, deviceDPI, IntSize(availableWidth, availableHeight));
- fprintf(stdout, "viewport size %dx%d scale %f with limits [%f, %f]\n", attrs.layoutSize.width(), attrs.layoutSize.height(), attrs.initialScale, attrs.minimumScale, attrs.maximumScale);
+ fprintf(stdout, "viewport size %dx%d scale %f with limits [%f, %f] and userScalable %f\n", attrs.layoutSize.width(), attrs.layoutSize.height(), attrs.initialScale, attrs.minimumScale, attrs.maximumScale, attrs.userScalable);
}
void DumpRenderTreeSupportGtk::clearOpener(WebKitWebFrame* frame)
@@ -652,7 +649,7 @@ bool DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker(WebKitWe
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), FALSE);
- return core(frame)->editor()->selectionStartHasSpellingMarkerFor(from, length);
+ return core(frame)->editor()->selectionStartHasMarkerFor(DocumentMarker::Spelling, from, length);
}
bool DumpRenderTreeSupportGtk::findString(WebKitWebView* webView, const gchar* targetString, WebKitFindOptions findOptions)
@@ -669,3 +666,32 @@ void DumpRenderTreeSupportGtk::setMinimumTimerInterval(WebKitWebView* webView, d
{
core(webView)->settings()->setMinDOMTimerInterval(interval);
}
+
+void DumpRenderTreeSupportGtk::setAutofilled(JSContextRef context, JSValueRef nodeObject, bool autofilled)
+{
+ JSC::ExecState* exec = toJS(context);
+ Element* element = toElement(toJS(exec, nodeObject));
+ if (!element)
+ return;
+ InputElement* inputElement = element->toInputElement();
+ if (!inputElement)
+ return;
+
+ static_cast<HTMLInputElement*>(inputElement)->setAutofilled(autofilled);
+}
+
+void DumpRenderTreeSupportGtk::setValueForUser(JSContextRef context, JSValueRef nodeObject, JSStringRef value)
+{
+ JSC::ExecState* exec = toJS(context);
+ Element* element = toElement(toJS(exec, nodeObject));
+ if (!element)
+ return;
+ InputElement* inputElement = element->toInputElement();
+ if (!inputElement)
+ return;
+
+ size_t bufferSize = JSStringGetMaximumUTF8CStringSize(value);
+ GOwnPtr<gchar> valueBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
+ JSStringGetUTF8CString(value, valueBuffer.get(), bufferSize);
+ inputElement->setValueForUser(String::fromUTF8(valueBuffer.get()));
+}
diff --git a/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index 595d6da..7ad5af6 100644
--- a/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -53,7 +53,6 @@ public:
static void setLinksIncludedInFocusChain(bool);
static bool linksIncludedInFocusChain();
- static void setIconDatabaseEnabled(bool);
static void setSelectTrailingWhitespaceEnabled(bool);
static bool selectTrailingWhitespaceEnabled();
@@ -85,6 +84,8 @@ public:
static AtkObject* getFocusedAccessibleElement(WebKitWebFrame*);
static AtkObject* getRootAccessibleElement(WebKitWebFrame*);
static void layoutFrame(WebKitWebFrame*);
+ static void setAutofilled(JSContextRef, JSValueRef, bool);
+ static void setValueForUser(JSContextRef, JSValueRef, JSStringRef);
// WebKitWebView
static void executeCoreCommandByName(WebKitWebView*, const gchar* name, const gchar* value);
diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index d8ea90e..ca8bf9a 100644
--- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -6,6 +6,7 @@
* Copyright (C) 2009, 2010 Gustavo Noronha Silva <gns@gnome.org>
* Copyright (C) Research In Motion Limited 2009. All rights reserved.
* Copyright (C) 2010 Igalia S.L.
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -65,6 +66,7 @@
#include "webkiterror.h"
#include "webkitglobals.h"
#include "webkitglobalsprivate.h"
+#include "webkiticondatabase.h"
#include "webkitnetworkrequest.h"
#include "webkitnetworkrequestprivate.h"
#include "webkitnetworkresponse.h"
@@ -710,9 +712,9 @@ PassRefPtr<Widget> FrameLoaderClient::createJavaAppletWidget(const IntSize& plug
return FrameLoaderClient::createPlugin(pluginSize, element, baseURL, paramNames, paramValues, "application/x-java-applet", false);
}
-ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType FrameLoaderClient::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
{
- return FrameLoader::defaultObjectContentType(url, mimeType);
+ return FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
}
String FrameLoaderClient::overrideMediaType() const
@@ -925,6 +927,10 @@ void FrameLoaderClient::dispatchDidReceiveIcon()
if (m_loadingErrorPage)
return;
+ const gchar* frameURI = webkit_web_frame_get_uri(m_frame);
+ WebKitIconDatabase* database = webkit_get_icon_database();
+ g_signal_emit_by_name(database, "icon-loaded", m_frame, frameURI);
+
WebKitWebView* webView = getViewFromFrame(m_frame);
// Avoid reporting favicons for non-main frames.
diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
index 3340837..b7ead7a 100644
--- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2006 Zack Rusin <zack@kde.org>
- * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006, 2011 Apple Inc. All rights reserved.
* Copyright (C) 2008 Collabora Ltd. All rights reserved.
*
* All rights reserved.
@@ -126,7 +126,7 @@ namespace WebKit {
virtual void registerForIconNotification(bool);
- virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
+ virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
virtual void setMainFrameDocumentReady(bool);
diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientEnchant.cpp b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientEnchant.cpp
index 74e8132..460000b 100644
--- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientEnchant.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientEnchant.cpp
@@ -77,16 +77,16 @@ void TextCheckerClientEnchant::checkSpellingOfString(const UChar* text, int leng
if (!dicts)
return;
- gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0);
- int utflen = g_utf8_strlen(ctext, -1);
+ GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0));
+ int utf8Length = g_utf8_strlen(utf8Text.get(), -1);
PangoLanguage* language(pango_language_get_default());
- GOwnPtr<PangoLogAttr> attrs(g_new(PangoLogAttr, utflen+1));
+ GOwnPtr<PangoLogAttr> attrs(g_new(PangoLogAttr, utf8Length + 1));
// pango_get_log_attrs uses an aditional position at the end of the text.
- pango_get_log_attrs(ctext, -1, -1, language, attrs.get(), utflen+1);
+ pango_get_log_attrs(utf8Text.get(), -1, -1, language, attrs.get(), utf8Length + 1);
- for (int i = 0; i < length+1; i++) {
+ for (int i = 0; i < length + 1; i++) {
// We go through each character until we find an is_word_start,
// then we get into an inner loop to find the is_word_end corresponding
// to it.
@@ -103,18 +103,15 @@ void TextCheckerClientEnchant::checkSpellingOfString(const UChar* text, int leng
// check characters twice.
i = end;
- for (; dicts; dicts = dicts->next) {
- EnchantDict* dict = static_cast<EnchantDict*>(dicts->data);
- gchar* cstart = g_utf8_offset_to_pointer(ctext, start);
- gint bytes = static_cast<gint>(g_utf8_offset_to_pointer(ctext, end) - cstart);
- gchar* word = g_new0(gchar, bytes+1);
- int result;
+ gchar* cstart = g_utf8_offset_to_pointer(utf8Text.get(), start);
+ gint bytes = static_cast<gint>(g_utf8_offset_to_pointer(utf8Text.get(), end) - cstart);
+ GOwnPtr<gchar> word(g_new0(gchar, bytes + 1));
- g_utf8_strncpy(word, cstart, end - start);
+ g_utf8_strncpy(word.get(), cstart, wordLength);
- result = enchant_dict_check(dict, word, -1);
- g_free(word);
- if (result) {
+ for (; dicts; dicts = dicts->next) {
+ EnchantDict* dict = static_cast<EnchantDict*>(dicts->data);
+ if (enchant_dict_check(dict, word.get(), wordLength)) {
*misspellingLocation = start;
*misspellingLength = wordLength;
} else {
diff --git a/Source/WebKit/gtk/po/ChangeLog b/Source/WebKit/gtk/po/ChangeLog
index 2b4b385..8febef5 100644
--- a/Source/WebKit/gtk/po/ChangeLog
+++ b/Source/WebKit/gtk/po/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-23 Luca Ferretti <lferrett@gnome.org>
+
+ Rubber-stamped by Gustavo Noronha.
+
+ Italian translation update.
+
+ * it.po: Updated.
+
2011-02-26 Christian Dywan <christian@lanedo.com>
Reviewed by Andreas Kling.
diff --git a/Source/WebKit/gtk/po/it.po b/Source/WebKit/gtk/po/it.po
index 0112a44..d30665a 100644
--- a/Source/WebKit/gtk/po/it.po
+++ b/Source/WebKit/gtk/po/it.po
@@ -1,12 +1,13 @@
# This is the Italian locale translation for WebKitGtk
# Copyright (C) 2009 Free Software Foundation, Inc.
-# Luca Ferretti <lferrett@gnome.org>, 2009, 2010.
+# Luca Ferretti <lferrett@gnome.org>, 2009, 2010, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: WebKitGtk\n"
-"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
-"POT-Creation-Date: 2010-02-25 15:53-0300\n"
-"PO-Revision-Date: 2010-03-18 22:13+0100\n"
+"Report-Msgid-Bugs-To: http://bugs.webkit.org\n"
+"POT-Creation-Date: 2010-12-27 15:26+0000\n"
+"PO-Revision-Date: 2011-03-23 13:44+0100\n"
"Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -14,321 +15,564 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535
+#: ../WebCoreSupport/ChromeClientGtk.cpp:589
msgid "Upload File"
msgstr "Carica file"
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143
+# merge da gtk
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:63
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:194
msgid "Input _Methods"
msgstr "Met_odi di input"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:80
msgid "LRM _Left-to-right mark"
msgstr "LRM - Contrassegno _sinistra-destra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:81
msgid "RLM _Right-to-left mark"
msgstr "RLM - Contrassegno _destra-sinistra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:82
msgid "LRE Left-to-right _embedding"
msgstr "LRE - _Inserimento sinistra-destra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:83
msgid "RLE Right-to-left e_mbedding"
msgstr "RLE - I_nserimento destra-sinistra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:84
msgid "LRO Left-to-right _override"
msgstr "LRO - _Forza sinistra-destra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:85
msgid "RLO Right-to-left o_verride"
msgstr "RLO - F_orza destra-sinistra"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:86
msgid "PDF _Pop directional formatting"
msgstr "PDF - Ca_ttura formattazione direzionale"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:87
msgid "ZWS _Zero width space"
msgstr "ZWS - Spa_zio a larghezza nulla"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:88
msgid "ZWJ Zero width _joiner"
msgstr "ZWJ - Spazio di _unione a larghezza nulla"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:89
msgid "ZWNJ Zero width _non-joiner"
msgstr "ZWNJ - Spazio non di unione a _larghezza nulla"
# merge da gtk
-#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138
+#: ../WebCoreSupport/ContextMenuClientGtk.cpp:111
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:189
msgid "_Insert Unicode Control Character"
msgstr "Inserisci carattere di controllo _Unicode"
-#: WebKit/gtk/webkit/webkitdownload.cpp:266
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1180
+msgid "Load request cancelled"
+msgstr "Richiesta di caricamento annullata"
+
+# messo una perché, in base al codice, sono diverse porte.
+# Grazie a Daniele Forsi
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1186
+msgid "Not allowed to use restricted network port"
+msgstr "Non è concesso usare una porta di rete con restrizioni"
+
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1192
+msgid "URL cannot be shown"
+msgstr "Impossibile mostrare l'URL"
+
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1198
+msgid "Frame load was interrupted"
+msgstr "Il caricamento del frame è stato interrotto"
+
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1204
+msgid "Content with the specified MIME type cannot be shown"
+msgstr "Impossibile mostrare il contenuto con il tipo MIME specificato"
+
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1210
+msgid "File does not exist"
+msgstr "Il file non esiste"
+
+#: ../WebCoreSupport/FrameLoaderClientGtk.cpp:1216
+msgid "Plugin will handle load"
+msgstr "Il plugin gestirà il caricamento"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:385
+msgid "Play"
+msgstr "Riproduci"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:387
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:533
+msgid "Play / Pause"
+msgstr "Riproduci / Pausa"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:533
+msgid "Play or pause the media"
+msgstr "Riproduce o mette in pausa il contenuto multimediale"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:541
+msgid "Time:"
+msgstr "Tempo:"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:565
+msgid "Exit Fullscreen"
+msgstr "Finestra normale"
+
+#: ../WebCoreSupport/FullscreenVideoController.cpp:565
+msgid "Exit from fullscreen mode"
+msgstr "Esce dalla modalità schermo intero"
+
+#: ../webkit/webkitdownload.cpp:273
msgid "Network Request"
msgstr "Richiesta di rete"
-#: WebKit/gtk/webkit/webkitdownload.cpp:267
+#: ../webkit/webkitdownload.cpp:274
msgid "The network request for the URI that should be downloaded"
msgstr "La richiesta di rete per l'URI che dovrebbe essere scaricato"
-#: WebKit/gtk/webkit/webkitdownload.cpp:281
+#: ../webkit/webkitdownload.cpp:288
msgid "Network Response"
msgstr "Risposta di rete"
-#: WebKit/gtk/webkit/webkitdownload.cpp:282
+#: ../webkit/webkitdownload.cpp:289
msgid "The network response for the URI that should be downloaded"
msgstr "La risposta di rete per l'URI che dovrebbe essere scaricato"
-#: WebKit/gtk/webkit/webkitdownload.cpp:296
+#: ../webkit/webkitdownload.cpp:303
msgid "Destination URI"
msgstr "URI di destinazione"
-#: WebKit/gtk/webkit/webkitdownload.cpp:297
+#: ../webkit/webkitdownload.cpp:304
msgid "The destination URI where to save the file"
msgstr "L'URI di destinazione in cui salvare il file"
-#: WebKit/gtk/webkit/webkitdownload.cpp:311
+#: ../webkit/webkitdownload.cpp:318
msgid "Suggested Filename"
msgstr "Nome file suggerito"
-#: WebKit/gtk/webkit/webkitdownload.cpp:312
+#: ../webkit/webkitdownload.cpp:319
msgid "The filename suggested as default when saving"
msgstr "Il nome di file suggerito come predefinito quando si salva"
-#: WebKit/gtk/webkit/webkitdownload.cpp:329
+#: ../webkit/webkitdownload.cpp:336
msgid "Progress"
msgstr "Avanzamento"
-#: WebKit/gtk/webkit/webkitdownload.cpp:330
+#: ../webkit/webkitdownload.cpp:337
msgid "Determines the current progress of the download"
msgstr "Determina l'avanzamento corrente dello scaricamento"
-#: WebKit/gtk/webkit/webkitdownload.cpp:343
+#: ../webkit/webkitdownload.cpp:350
msgid "Status"
msgstr "Stato"
-#: WebKit/gtk/webkit/webkitdownload.cpp:344
+#: ../webkit/webkitdownload.cpp:351
msgid "Determines the current status of the download"
msgstr "Determina lo stato corrente dello scaricamento"
-#: WebKit/gtk/webkit/webkitdownload.cpp:359
+#: ../webkit/webkitdownload.cpp:366
msgid "Current Size"
msgstr "Dimensione corrente"
-#: WebKit/gtk/webkit/webkitdownload.cpp:360
+#: ../webkit/webkitdownload.cpp:367
msgid "The length of the data already downloaded"
msgstr "La lunghezza dei dati già scaricati"
-#: WebKit/gtk/webkit/webkitdownload.cpp:374
+#: ../webkit/webkitdownload.cpp:381
msgid "Total Size"
msgstr "Dimensione totale"
-#: WebKit/gtk/webkit/webkitdownload.cpp:375
+#: ../webkit/webkitdownload.cpp:382
msgid "The total size of the file"
msgstr "La dimensione totale del file"
-#: WebKit/gtk/webkit/webkitdownload.cpp:526
+#: ../webkit/webkitdownload.cpp:534
msgid "User cancelled the download"
msgstr "L'utente ha annullato lo scaricamento"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:248
+#: ../webkit/webkithittestresult.cpp:156
+msgid "Context"
+msgstr "Contesto"
+
+#: ../webkit/webkithittestresult.cpp:157
+msgid "Flags indicating the kind of target that received the event."
+msgstr "Flag che indicano il tipo di destinazione che ha ricevuto l'evento."
+
+#: ../webkit/webkithittestresult.cpp:171
+msgid "Link URI"
+msgstr "URI collegamento"
+
+#: ../webkit/webkithittestresult.cpp:172
+msgid "The URI to which the target that received the event points, if any."
+msgstr ""
+"L'URI a cui punta la destinazione che ha ricevuto l'evento, se presente."
+
+#: ../webkit/webkithittestresult.cpp:185
+msgid "Image URI"
+msgstr "URI immagine"
+
+#: ../webkit/webkithittestresult.cpp:186
+msgid ""
+"The URI of the image that is part of the target that received the event, if "
+"any."
+msgstr ""
+"L'URI dell'immagine che è parte della destinazione che ha ricevuto l'evento, "
+"se presente."
+
+#: ../webkit/webkithittestresult.cpp:199
+msgid "Media URI"
+msgstr "URI contenuto multimediale"
+
+#: ../webkit/webkithittestresult.cpp:200
+msgid ""
+"The URI of the media that is part of the target that received the event, if "
+"any."
+msgstr ""
+"L'URI del contenuto multimediale che è parte della destinazione che ha "
+"ricevuto l'evento, se presente."
+
+#: ../webkit/webkithittestresult.cpp:221
+msgid "Inner node"
+msgstr "Nodo interno"
+
+#: ../webkit/webkithittestresult.cpp:222
+msgid "The inner DOM node associated with the hit test result."
+msgstr "Il nodo DOM interno associato con il risultato dell'hit test."
+
+#: ../webkit/webkitnetworkrequest.cpp:134
+#: ../webkit/webkitnetworkresponse.cpp:134 ../webkit/webkitwebframe.cpp:323
+#: ../webkit/webkitwebhistoryitem.cpp:176 ../webkit/webkitwebresource.cpp:126
+#: ../webkit/webkitwebview.cpp:2997
+msgid "URI"
+msgstr "URI"
+
+#: ../webkit/webkitnetworkrequest.cpp:135
+msgid "The URI to which the request will be made."
+msgstr "L'URI a cui sarà fatta la richiesta."
+
+#: ../webkit/webkitnetworkrequest.cpp:148
+#: ../webkit/webkitnetworkresponse.cpp:148
+msgid "Message"
+msgstr "Messaggio"
+
+#: ../webkit/webkitnetworkrequest.cpp:149
+msgid "The SoupMessage that backs the request."
+msgstr "Il SoupMessage che accompagna la richesta."
+
+#: ../webkit/webkitnetworkresponse.cpp:135
+msgid "The URI to which the response will be made."
+msgstr "L'URI a cui verrà data la risposta."
+
+#: ../webkit/webkitnetworkresponse.cpp:149
+msgid "The SoupMessage that backs the response."
+msgstr "Il SoupMessage che accompagna la risposta."
+
+#: ../webkit/webkitsecurityorigin.cpp:150
+msgid "Protocol"
+msgstr "Protocollo"
+
+# origine di sicurezza??????
+#: ../webkit/webkitsecurityorigin.cpp:151
+msgid "The protocol of the security origin"
+msgstr "Il protocollo dell'origine della sicurezza"
+
+#: ../webkit/webkitsecurityorigin.cpp:164
+msgid "Host"
+msgstr "Host"
+
+#: ../webkit/webkitsecurityorigin.cpp:165
+msgid "The host of the security origin"
+msgstr "L'host dell'origine della sicurezza"
+
+#: ../webkit/webkitsecurityorigin.cpp:178
+msgid "Port"
+msgstr "Porta"
+
+#: ../webkit/webkitsecurityorigin.cpp:179
+msgid "The port of the security origin"
+msgstr "La porta dell'origine della sicurezza"
+
+#: ../webkit/webkitsecurityorigin.cpp:192
+msgid "Web Database Usage"
+msgstr "Uso database web"
+
+#: ../webkit/webkitsecurityorigin.cpp:193
+msgid "The cumulative size of all web databases in the security origin"
+msgstr ""
+"La dimensione cumulativa di tutti i database web nell'origine della sicurezza"
+
+#: ../webkit/webkitsecurityorigin.cpp:205
+msgid "Web Database Quota"
+msgstr "Quota database web"
+
+#: ../webkit/webkitsecurityorigin.cpp:206
+msgid "The web database quota of the security origin in bytes"
+msgstr "La quota di database web dell'origine della sicurezza in byte"
+
+#: ../webkit/webkitsoupauthdialog.c:264
#, c-format
msgid "A username and password are being requested by the site %s"
msgstr "Il sito %s richiede un nome utente e una password"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
+#: ../webkit/webkitsoupauthdialog.c:294
msgid "Server message:"
msgstr "Messaggio del server:"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
+#: ../webkit/webkitsoupauthdialog.c:307
msgid "Username:"
msgstr "Nome utente:"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:293
+#: ../webkit/webkitsoupauthdialog.c:309
msgid "Password:"
msgstr "Password:"
# checkbox
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:302
+#: ../webkit/webkitsoupauthdialog.c:318
msgid "_Remember password"
msgstr "_Ricordare la password"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:298
+#: ../webkit/webkitwebdatabase.cpp:173
+msgid "Security Origin"
+msgstr "Origine della sicurezza"
+
+#: ../webkit/webkitwebdatabase.cpp:174
+msgid "The security origin of the database"
+msgstr "L'origine della sicurezza del database"
+
+#: ../webkit/webkitwebdatabase.cpp:187 ../webkit/webkitwebframe.cpp:309
msgid "Name"
msgstr "Nome"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:299
+#: ../webkit/webkitwebdatabase.cpp:188
+msgid "The name of the Web Database database"
+msgstr "Il nome del database Web Database"
+
+#: ../webkit/webkitwebdatabase.cpp:201
+msgid "Display Name"
+msgstr "Nome visibile"
+
+#: ../webkit/webkitwebdatabase.cpp:202
+msgid "The display name of the Web Storage database"
+msgstr "Il nome visibile del database Web Storage"
+
+#: ../webkit/webkitwebdatabase.cpp:215
+msgid "Expected Size"
+msgstr "Dimensione attesa"
+
+#: ../webkit/webkitwebdatabase.cpp:216
+msgid "The expected size of the Web Database database"
+msgstr "La dimensione attesa del database Web Database"
+
+#: ../webkit/webkitwebdatabase.cpp:228
+msgid "Size"
+msgstr "Dimensione"
+
+#: ../webkit/webkitwebdatabase.cpp:229
+msgid "The current size of the Web Database database"
+msgstr "La dimensione attuale del database Web Database"
+
+#: ../webkit/webkitwebdatabase.cpp:241
+msgid "Filename"
+msgstr "Nome file"
+
+#: ../webkit/webkitwebdatabase.cpp:242
+msgid "The absolute filename of the Web Storage database"
+msgstr "Il nome file assoluto del database Web Storage"
+
+#: ../webkit/webkitwebframe.cpp:310
msgid "The name of the frame"
-msgstr "Il nome della cornice"
+msgstr "Il nome del frame"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:305
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146
-#: WebKit/gtk/webkit/webkitwebview.cpp:2318
+#: ../webkit/webkitwebframe.cpp:316 ../webkit/webkitwebhistoryitem.cpp:144
+#: ../webkit/webkitwebview.cpp:2983
msgid "Title"
msgstr "Titolo"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:306
+#: ../webkit/webkitwebframe.cpp:317
msgid "The document title of the frame"
-msgstr "Il titolo del documento nella cornice"
-
-#: WebKit/gtk/webkit/webkitwebframe.cpp:312
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178
-#: WebKit/gtk/webkit/webkitwebview.cpp:2332
-msgid "URI"
-msgstr "URI"
+msgstr "Il titolo del documento nel frame"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:313
+#: ../webkit/webkitwebframe.cpp:324
msgid "The current URI of the contents displayed by the frame"
-msgstr "L'URI corrente del contenuto mostrato dalla cornice"
+msgstr "L'URI corrente del contenuto mostrato dal frame"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:344
+#: ../webkit/webkitwebframe.cpp:355
msgid "Horizontal Scrollbar Policy"
msgstr "Politica barra scorrimento orizzontale"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:345
+#: ../webkit/webkitwebframe.cpp:356
msgid ""
"Determines the current policy for the horizontal scrollbar of the frame."
msgstr ""
-"Determina la politica attuale per la barra di scorrimento orizzontale della "
-"cornice."
+"Determina la politica attuale per la barra di scorrimento orizzontale del "
+"frame."
-#: WebKit/gtk/webkit/webkitwebframe.cpp:362
+#: ../webkit/webkitwebframe.cpp:373
msgid "Vertical Scrollbar Policy"
msgstr "Politica barra scorrimento verticale"
-#: WebKit/gtk/webkit/webkitwebframe.cpp:363
+#: ../webkit/webkitwebframe.cpp:374
msgid "Determines the current policy for the vertical scrollbar of the frame."
msgstr ""
"Determina la politica attuale per la barra di scorrimento verticale del "
-"cornice."
+"frame."
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
+#: ../webkit/webkitwebhistoryitem.cpp:145
msgid "The title of the history item"
msgstr "Il titolo dell'elemento di cronologia"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162
+#: ../webkit/webkitwebhistoryitem.cpp:160
msgid "Alternate Title"
msgstr "Titolo alternativo"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163
+#: ../webkit/webkitwebhistoryitem.cpp:161
msgid "The alternate title of the history item"
msgstr "Il titolo alternativo dell'elemento di cronologia"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179
+#: ../webkit/webkitwebhistoryitem.cpp:177
msgid "The URI of the history item"
msgstr "L'URI dell'elemento di cronologia"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173
+#: ../webkit/webkitwebhistoryitem.cpp:192
+#: ../webkit/webkitwebnavigationaction.cpp:171
msgid "Original URI"
msgstr "URI originale"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195
+#: ../webkit/webkitwebhistoryitem.cpp:193
msgid "The original URI of the history item"
msgstr "L'URI originale dell'elemento di cronologia"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210
+#: ../webkit/webkitwebhistoryitem.cpp:208
msgid "Last visited Time"
msgstr "Data ultima visita"
-#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211
+#: ../webkit/webkitwebhistoryitem.cpp:209
msgid "The time at which the history item was last visited"
msgstr ""
"La data in cui l'elemento di cronologia è stato visitato l'ultima volta"
# lasciato non tradotto perchè termine interno di WebKitGtk
# cfr http://webkitgtk.org/reference/webkitgtk-WebKitWebInspector.html#WebKitWebInspector--web-view
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:268
+#: ../webkit/webkitwebinspector.cpp:270
msgid "Web View"
-msgstr "Web View"
+msgstr "Web view"
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:269
+#: ../webkit/webkitwebinspector.cpp:271
msgid "The Web View that renders the Web Inspector itself"
-msgstr "La Web View che esegue il rendering dell'Ispettore web stesso"
+msgstr "La Web view che esegue il rendering dell'Ispettore web stesso"
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:282
+#: ../webkit/webkitwebinspector.cpp:284
msgid "Inspected URI"
msgstr "URI ispezionato"
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:283
+#: ../webkit/webkitwebinspector.cpp:285
msgid "The URI that is currently being inspected"
msgstr "L'URI che attualmente è ispezionato"
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:299
+#: ../webkit/webkitwebinspector.cpp:301
msgid "Enable JavaScript profiling"
msgstr "Abilita profiling JavaScript"
# FIXME
# oppure Esegue il profiling?
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:300
+#: ../webkit/webkitwebinspector.cpp:302
msgid "Profile the executed JavaScript."
msgstr "Traccia un profilo del codice JavaScript eseguito."
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:315
+#: ../webkit/webkitwebinspector.cpp:317
msgid "Enable Timeline profiling"
msgstr "Abilita profiling Timeline"
-#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
+#: ../webkit/webkitwebinspector.cpp:318
msgid "Profile the WebCore instrumentation."
msgstr "Traccia un profilo della strumentazione WebCore."
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
+#: ../webkit/webkitwebnavigationaction.cpp:156
msgid "Reason"
msgstr "Motivo"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159
+#: ../webkit/webkitwebnavigationaction.cpp:157
msgid "The reason why this navigation is occurring"
msgstr "Il motivo per cui questa navigazione si sta verificando"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174
+#: ../webkit/webkitwebnavigationaction.cpp:172
msgid "The URI that was requested as the target for the navigation"
-msgstr "L'URI che è stata richiesta come destinazione della navigazione"
+msgstr "L'URI che è stato richiesto come destinazione della navigazione"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188
+#: ../webkit/webkitwebnavigationaction.cpp:186
msgid "Button"
msgstr "Pulsante"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189
+#: ../webkit/webkitwebnavigationaction.cpp:187
msgid "The button used to click"
msgstr "Il pulsante usato per fare clic"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204
+#: ../webkit/webkitwebnavigationaction.cpp:202
msgid "Modifier state"
msgstr "Stato modificatori"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205
+#: ../webkit/webkitwebnavigationaction.cpp:203
msgid "A bitmask representing the state of the modifier keys"
msgstr "Una maschera di bit che rappresenta lo stato dei tasti modificatori"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
+#: ../webkit/webkitwebnavigationaction.cpp:218
msgid "Target frame"
-msgstr "Cornice destinazione"
+msgstr "Frame destinazione"
-#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
+#: ../webkit/webkitwebnavigationaction.cpp:219
msgid "The target frame for the navigation"
-msgstr "La cornice di destinazione per la navigazione"
+msgstr "Il frame di destinazione per la navigazione"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:237
+#: ../webkit/webkitwebresource.cpp:127
+msgid "The uri of the resource"
+msgstr "L'URI della risorsa"
+
+#: ../webkit/webkitwebresource.cpp:141
+msgid "MIME Type"
+msgstr "Tipo MIME"
+
+#: ../webkit/webkitwebresource.cpp:142
+msgid "The MIME type of the resource"
+msgstr "Il tipo MIME della risorsa"
+
+#: ../webkit/webkitwebresource.cpp:156 ../webkit/webkitwebview.cpp:3132
+msgid "Encoding"
+msgstr "Codifica"
+
+#: ../webkit/webkitwebresource.cpp:157
+msgid "The text encoding name of the resource"
+msgstr "Il nome di codifica del testo della risorsa"
+
+#: ../webkit/webkitwebresource.cpp:172
+msgid "Frame Name"
+msgstr "Nome frame"
+
+#: ../webkit/webkitwebresource.cpp:173
+msgid "The frame name of the resource"
+msgstr "Il nome frame della risorsa"
+
+#: ../webkit/webkitwebsettings.cpp:252
msgid "Default Encoding"
msgstr "Codifica predefinita"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:238
+#: ../webkit/webkitwebsettings.cpp:253
msgid "The default encoding used to display text."
msgstr "La codifica predefinita usata per mostrare il testo."
@@ -337,90 +581,90 @@ msgstr "La codifica predefinita usata per mostrare il testo."
# * nella "breve" si lascia la forma inglese (es. sans serif) nella lunga
# si mette la forma italiana (es. senza grazie)
# Ciò per mantenere corte le "brevi" e per permettere che entrambe le diciture siano presenti
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:246
+#: ../webkit/webkitwebsettings.cpp:261
msgid "Cursive Font Family"
msgstr "Famiglia carattere corsivo"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:247
+#: ../webkit/webkitwebsettings.cpp:262
msgid "The default Cursive font family used to display text."
msgstr ""
"La famiglia del tipo di carattere \"corsivo\" predefinito usata per mostrare "
"il testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:255
+#: ../webkit/webkitwebsettings.cpp:270
msgid "Default Font Family"
msgstr "Famiglia carattere predefinita"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:256
+#: ../webkit/webkitwebsettings.cpp:271
msgid "The default font family used to display text."
msgstr ""
"La famiglia del tipo di carattere predefinito usata per mostrare il testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:264
+#: ../webkit/webkitwebsettings.cpp:279
msgid "Fantasy Font Family"
msgstr "Famiglia carattere fantasia"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:265
+#: ../webkit/webkitwebsettings.cpp:280
msgid "The default Fantasy font family used to display text."
msgstr ""
"La famiglia del tipo di carattere \"fantasia\" predefinito usata per "
"mostrare il testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:273
+#: ../webkit/webkitwebsettings.cpp:288
msgid "Monospace Font Family"
msgstr "Famiglia carattere monospace"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:274
+#: ../webkit/webkitwebsettings.cpp:289
msgid "The default font family used to display monospace text."
msgstr ""
"La famiglia del tipo di carattere predefinito usata per mostrare il testo a "
"spaziatura fissa."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:282
+#: ../webkit/webkitwebsettings.cpp:297
msgid "Sans Serif Font Family"
msgstr "Famiglia carattere sans serif"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:283
+#: ../webkit/webkitwebsettings.cpp:298
msgid "The default Sans Serif font family used to display text."
msgstr ""
"La famiglia del tipo di carattere \"senza grazie\" predefinito usata per "
"mostrare il testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:291
+#: ../webkit/webkitwebsettings.cpp:306
msgid "Serif Font Family"
msgstr "Famiglia carattere serif"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:292
+#: ../webkit/webkitwebsettings.cpp:307
msgid "The default Serif font family used to display text."
msgstr ""
"La famiglia del tipo di carattere \"con grazie\" predefinito usata per "
"mostrare il testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:300
+#: ../webkit/webkitwebsettings.cpp:315
msgid "Default Font Size"
msgstr "Dimensione predefinita carattere"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:301
+#: ../webkit/webkitwebsettings.cpp:316
msgid "The default font size used to display text."
msgstr ""
"La dimensione predefinita per il tipo di carattere usato per mostrare il "
"testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:309
+#: ../webkit/webkitwebsettings.cpp:324
msgid "Default Monospace Font Size"
msgstr "Dimensione predefinita carattere monospace"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:310
+#: ../webkit/webkitwebsettings.cpp:325
msgid "The default font size used to display monospace text."
msgstr ""
"La dimensione predefinita per il tipo di carattere usato per mostrare il "
"testo a larghezza fissa."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:318
+#: ../webkit/webkitwebsettings.cpp:333
msgid "Minimum Font Size"
msgstr "Dimensione minima carattere"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:319
+#: ../webkit/webkitwebsettings.cpp:334
msgid "The minimum font size used to display text."
msgstr ""
"La dimensione minima per il tipo di carattere usato per mostrare il testo."
@@ -437,221 +681,245 @@ msgstr ""
# size alone. This will assure that your content will never display at sizes less than 12 points,
# but the functional font size boundary of the web view will remain at 9 points to prevent any
# chance of displaying unnecessarily small text.
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:327
+#: ../webkit/webkitwebsettings.cpp:342
msgid "Minimum Logical Font Size"
msgstr "Dimensione minima naturale carattere"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:328
+#: ../webkit/webkitwebsettings.cpp:343
msgid "The minimum logical font size used to display text."
msgstr ""
"La dimensione minima naturale per il tipo di carattere usato per mostrare il "
"testo."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:347
+#: ../webkit/webkitwebsettings.cpp:362
msgid "Enforce 96 DPI"
msgstr "Forza 96 DPI"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:348
+#: ../webkit/webkitwebsettings.cpp:363
msgid "Enforce a resolution of 96 DPI"
msgstr "Forza la risoluzione a 96 DPI"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:356
+#: ../webkit/webkitwebsettings.cpp:371
msgid "Auto Load Images"
msgstr "Caricamento automatico immagini"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:357
+#: ../webkit/webkitwebsettings.cpp:372
msgid "Load images automatically."
msgstr "Carica le immagini in modo automatico."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:365
+#: ../webkit/webkitwebsettings.cpp:380
msgid "Auto Shrink Images"
msgstr "Restringimento automatico immagini"
# assolutamente libertario
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:366
+#: ../webkit/webkitwebsettings.cpp:381
msgid "Automatically shrink standalone images to fit."
msgstr "Restringe automaticamente le immagini singole alla dimensione adatta."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:374
+#: ../webkit/webkitwebsettings.cpp:389
msgid "Print Backgrounds"
msgstr "Stampa sfondi"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:375
+#: ../webkit/webkitwebsettings.cpp:390
msgid "Whether background images should be printed."
msgstr "Indica se le immagini di sfondo devono essere stampate."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:383
+#: ../webkit/webkitwebsettings.cpp:398
msgid "Enable Scripts"
msgstr "Abilita script"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:384
+#: ../webkit/webkitwebsettings.cpp:399
msgid "Enable embedded scripting languages."
msgstr "Abilita i linguaggi di scripting incorporati."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:392
+#: ../webkit/webkitwebsettings.cpp:407
msgid "Enable Plugins"
msgstr "Abilita plugin"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:393
+#: ../webkit/webkitwebsettings.cpp:408
msgid "Enable embedded plugin objects."
msgstr "Abilita gli oggetti plugin incorporati."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:401
+#: ../webkit/webkitwebsettings.cpp:416
msgid "Resizable Text Areas"
msgstr "Aree testo ridimensionabili"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:402
+#: ../webkit/webkitwebsettings.cpp:417
msgid "Whether text areas are resizable."
msgstr "Indica se le aree di testo sono ridimensionabili."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:409
+#: ../webkit/webkitwebsettings.cpp:424
msgid "User Stylesheet URI"
msgstr "URI foglio stile utente"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:410
+#: ../webkit/webkitwebsettings.cpp:425
msgid "The URI of a stylesheet that is applied to every page."
msgstr "L'URI di un foglio di stile che è applicato a ogni pagina."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:425
+#: ../webkit/webkitwebsettings.cpp:440
msgid "Zoom Stepping Value"
msgstr "Valore passo ingrandimento"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:426
+#: ../webkit/webkitwebsettings.cpp:441
msgid "The value by which the zoom level is changed when zooming in or out."
msgstr ""
"Il valore di variazione del livello di ingrandimento quando si aumenta o "
"riduce l'ingrandimento."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:444
+#: ../webkit/webkitwebsettings.cpp:459
msgid "Enable Developer Extras"
msgstr "Abilita extra per sviluppatori"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:445
+#: ../webkit/webkitwebsettings.cpp:460
msgid "Enables special extensions that help developers"
msgstr "Abilita estensioni speciali che sono d'aiuto per gli sviluppatori"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:465
+#: ../webkit/webkitwebsettings.cpp:480
msgid "Enable Private Browsing"
msgstr "Abilita navigazione privata"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:466
+#: ../webkit/webkitwebsettings.cpp:481
msgid "Enables private browsing mode"
msgstr "Abilita la modalità di navigazione privata"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:481
+#: ../webkit/webkitwebsettings.cpp:496
msgid "Enable Spell Checking"
msgstr "Abilita controllo ortografico"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:482
+#: ../webkit/webkitwebsettings.cpp:497
msgid "Enables spell checking while typing"
msgstr "Abilita il controllo ortografico durante la digitazione"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:505
+#: ../webkit/webkitwebsettings.cpp:520
msgid "Languages to use for spell checking"
msgstr "Lingue da usare per controllo ortografico"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:506
+#: ../webkit/webkitwebsettings.cpp:521
msgid "Comma separated list of languages to use for spell checking"
msgstr ""
"Elenco separato da virgole delle lingue da usare per il controllo ortografico"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:520
+#: ../webkit/webkitwebsettings.cpp:535
msgid "Enable Caret Browsing"
msgstr "Abilita navigazione con cursore"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:521
-msgid "Whether to enable accessibility enhanced keyboard navigation"
+#: ../webkit/webkitwebsettings.cpp:536
+msgid "Whether to enable accesibility enhanced keyboard navigation"
msgstr ""
"Indica se abilitare la navigazione da tastiera ottimizzata per "
"l'accessibilità"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:536
+#: ../webkit/webkitwebsettings.cpp:551
msgid "Enable HTML5 Database"
-msgstr "Abilita Database HTML5"
+msgstr "Abilita database HTML5"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:537
+#: ../webkit/webkitwebsettings.cpp:552
msgid "Whether to enable HTML5 database support"
msgstr "Indica se abilitare il supporto ai database di HTML5"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:552
+#: ../webkit/webkitwebsettings.cpp:567
msgid "Enable HTML5 Local Storage"
-msgstr "Abilita Local Storage HTML5"
+msgstr "Abilita local storage HTML5"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:553
+#: ../webkit/webkitwebsettings.cpp:568
msgid "Whether to enable HTML5 Local Storage support"
msgstr "Indica se abilitare il supporto a local storage di HTML5"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:567
+#: ../webkit/webkitwebsettings.cpp:582
msgid "Enable XSS Auditor"
msgstr "Abilita auditor XSS"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:568
-msgid "Whether to enable teh XSS auditor"
+#: ../webkit/webkitwebsettings.cpp:583
+msgid "Whether to enable the XSS auditor"
msgstr "Indica se abilitare l'auditor XSS"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:586
+#: ../webkit/webkitwebsettings.cpp:601
+msgid "Enable Spatial Navigation"
+msgstr "Abilita navigazione spaziale"
+
+#: ../webkit/webkitwebsettings.cpp:602
+msgid "Whether to enable Spatial Navigation"
+msgstr "Indica se abilitare la navigazione spaziale"
+
+#: ../webkit/webkitwebsettings.cpp:620
+msgid "Enable Frame Flattening"
+msgstr "Abilita appiattimento frame"
+
+#: ../webkit/webkitwebsettings.cpp:621
+msgid "Whether to enable Frame Flattening"
+msgstr "Indica se abilitare l'appiattimento dei frame"
+
+#: ../webkit/webkitwebsettings.cpp:638
msgid "User Agent"
-msgstr "User Agent"
+msgstr "User agent"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:587
+#: ../webkit/webkitwebsettings.cpp:639
msgid "The User-Agent string used by WebKitGtk"
msgstr "La stringa User-Agent usata da WebKitGtk"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:602
+#: ../webkit/webkitwebsettings.cpp:654
msgid "JavaScript can open windows automatically"
-msgstr "JavaScript può aprire automatamente le fineste"
+msgstr "JavaScript può aprire automaticamente le finestre"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:603
+#: ../webkit/webkitwebsettings.cpp:655
msgid "Whether JavaScript can open windows automatically"
-msgstr "Indica se JavaScript può aprire automatamente le fineste"
+msgstr "Indica se JavaScript può aprire automaticamente le finestre"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:618
+#: ../webkit/webkitwebsettings.cpp:669
+msgid "JavaScript can access Clipboard"
+msgstr "JavaScript può accedere agli appunti"
+
+#: ../webkit/webkitwebsettings.cpp:670
+msgid "Whether JavaScript can access Clipboard"
+msgstr "Indica se JavaScript può accedere agli appunti"
+
+#: ../webkit/webkitwebsettings.cpp:686
msgid "Enable offline web application cache"
msgstr "Abilita cache per applicazioni web fuori rete"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:619
+#: ../webkit/webkitwebsettings.cpp:687
msgid "Whether to enable offline web application cache"
msgstr "Indica se abilitare la cache per le applicazioni web fuori rete"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:646
+#: ../webkit/webkitwebsettings.cpp:715
msgid "Editing behavior"
msgstr "Comportamento editing"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:647
+#: ../webkit/webkitwebsettings.cpp:716
msgid "The behavior mode to use in editing mode"
msgstr "La modalità di comportamento da usare in modalità editing"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:663
+#: ../webkit/webkitwebsettings.cpp:732
msgid "Enable universal access from file URIs"
-msgstr "Abilita accesso univesale dagli URI di file"
+msgstr "Abilita accesso universale dagli URI di file"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:664
+#: ../webkit/webkitwebsettings.cpp:733
msgid "Whether to allow universal access from file URIs"
-msgstr "Indica se abilitare l'accesso univesale dagli URI di file"
+msgstr "Indica se abilitare l'accesso universale dagli URI di file"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:679
+#: ../webkit/webkitwebsettings.cpp:748
msgid "Enable DOM paste"
msgstr "Abilita DOM pasting"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:680
+#: ../webkit/webkitwebsettings.cpp:749
msgid "Whether to enable DOM paste"
msgstr "Indica se abilitare il DOM pasting"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:698
+#: ../webkit/webkitwebsettings.cpp:767
msgid "Tab key cycles through elements"
msgstr "Tasto TAB per passare tra gli elementi"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:699
+#: ../webkit/webkitwebsettings.cpp:768
msgid "Whether the tab key cycles through elements on the page."
msgstr ""
"Indica se il tasto TAB permette di passare ciclicamente tra gli elementi "
"della pagina."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:719
+#: ../webkit/webkitwebsettings.cpp:788
msgid "Enable Default Context Menu"
msgstr "Abilita menù contestuale predefinito"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:720
+#: ../webkit/webkitwebsettings.cpp:789
msgid ""
"Enables the handling of right-clicks for the creation of the default context "
"menu"
@@ -659,251 +927,311 @@ msgstr ""
"Abilita la gestione dei clic destri per la creazione del menù contestuale "
"predefinito"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:740
+#: ../webkit/webkitwebsettings.cpp:809
msgid "Enable Site Specific Quirks"
msgstr "Abilita scappatoie specifiche per siti"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:741
+#: ../webkit/webkitwebsettings.cpp:810
msgid "Enables the site-specific compatibility workarounds"
msgstr ""
"Abilita delle correzioni di compatibilità specifiche per determinati siti"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:763
+#: ../webkit/webkitwebsettings.cpp:832
msgid "Enable page cache"
msgstr "Abilita la cache di pagina"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:764
+#: ../webkit/webkitwebsettings.cpp:833
msgid "Whether the page cache should be used"
msgstr "Indica se usare la cache delle pagine"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:784
+#: ../webkit/webkitwebsettings.cpp:853
msgid "Auto Resize Window"
msgstr "Ridimensionamento automatico finestra"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:785
+#: ../webkit/webkitwebsettings.cpp:854
msgid "Automatically resize the toplevel window when a page requests it"
msgstr ""
"Ridimensiona automaticamente la finestra di livello principale quando "
"richiesto da una pagina"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
+#: ../webkit/webkitwebsettings.cpp:886
msgid "Enable Java Applet"
msgstr "Abilita applet Java"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
+#: ../webkit/webkitwebsettings.cpp:887
msgid "Whether Java Applet support through <applet> should be enabled"
msgstr "Indica se abilitare il supporto alle applet Java attraverso <applet>"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2319
+#: ../webkit/webkitwebsettings.cpp:901
+msgid "Enable Hyperlink Auditing"
+msgstr "Abilita auditing hyperlink"
+
+#: ../webkit/webkitwebsettings.cpp:902
+msgid "Whether <a ping> should be able to send pings"
+msgstr "Indica se <a ping> sia in grado di inviare ping"
+
+#: ../webkit/webkitwebsettings.cpp:910
+msgid "Enable Fullscreen"
+msgstr "Abilita schermo intero"
+
+#: ../webkit/webkitwebsettings.cpp:911
+msgid "Whether the Mozilla style API should be enabled."
+msgstr "Indica se abilitare le API in stile Mozilla."
+
+#: ../webkit/webkitwebview.cpp:2984
msgid "Returns the @web_view's document title"
msgstr "Restituisce il titolo del documento di @web_view"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2333
+#: ../webkit/webkitwebview.cpp:2998
msgid "Returns the current URI of the contents displayed by the @web_view"
msgstr "Restituisce l'URI attuale del contenuto mostrato dalla @web_view"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2346
+#: ../webkit/webkitwebview.cpp:3011
msgid "Copy target list"
msgstr "Copia elenco destinazioni"
# ma ha senso??
-#: WebKit/gtk/webkit/webkitwebview.cpp:2347
+#: ../webkit/webkitwebview.cpp:3012
msgid "The list of targets this web view supports for clipboard copying"
msgstr ""
"L'elenco di destinazioni che questa vista web supporta per copiare negli "
"appunti"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2360
+#: ../webkit/webkitwebview.cpp:3025
msgid "Paste target list"
msgstr "Incolla elenco destinazioni"
# ma ha senso??
-#: WebKit/gtk/webkit/webkitwebview.cpp:2361
+#: ../webkit/webkitwebview.cpp:3026
msgid "The list of targets this web view supports for clipboard pasting"
msgstr ""
"L'elenco di destinazioni che questa vista web supporta per incollare dagli "
"appunti"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2367
+#: ../webkit/webkitwebview.cpp:3032
msgid "Settings"
msgstr "Impostazioni"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2368
+#: ../webkit/webkitwebview.cpp:3033
msgid "An associated WebKitWebSettings instance"
msgstr "Un'istanza WebKitWebSettings associata"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2381
+#: ../webkit/webkitwebview.cpp:3046
msgid "Web Inspector"
msgstr "Ispettore web"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2382
+#: ../webkit/webkitwebview.cpp:3047
msgid "The associated WebKitWebInspector instance"
msgstr "L'istanza WebKitWebInspector associata"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2402
+#: ../webkit/webkitwebview.cpp:3060
+msgid "Viewport Attributes"
+msgstr "Attributi viewport"
+
+#: ../webkit/webkitwebview.cpp:3061
+msgid "The associated WebKitViewportAttributes instance"
+msgstr "L'istanza WebKitViewportAttributes associata"
+
+#: ../webkit/webkitwebview.cpp:3081
msgid "Editable"
msgstr "Modificabile"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2403
+#: ../webkit/webkitwebview.cpp:3082
msgid "Whether content can be modified by the user"
msgstr "Indica se il contenuto può essere modificato dall'utente"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2409
+#: ../webkit/webkitwebview.cpp:3088
msgid "Transparent"
msgstr "Trasparente"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2410
+#: ../webkit/webkitwebview.cpp:3089
msgid "Whether content has a transparent background"
msgstr "Indica se il contenuto ha uno sfondo trasparente"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2423
+#: ../webkit/webkitwebview.cpp:3102
msgid "Zoom level"
msgstr "Livello ingrandimento"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2424
+#: ../webkit/webkitwebview.cpp:3103
msgid "The level of zoom of the content"
msgstr "Il livello di ingrandimento del contenuto"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2439
+#: ../webkit/webkitwebview.cpp:3118
msgid "Full content zoom"
msgstr "Ingrandimento intero contenuto"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2440
+#: ../webkit/webkitwebview.cpp:3119
msgid "Whether the full content is scaled when zooming"
msgstr "Indica se all'ingrandimento viene scalato l'intero contenuto"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2453
-msgid "Encoding"
-msgstr "Codifica"
-
-#: WebKit/gtk/webkit/webkitwebview.cpp:2454
+#: ../webkit/webkitwebview.cpp:3133
msgid "The default encoding of the web view"
msgstr "La codifica predefinita della vista web"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2467
+#: ../webkit/webkitwebview.cpp:3146
msgid "Custom Encoding"
msgstr "Codifica personalizzata"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2468
+#: ../webkit/webkitwebview.cpp:3147
msgid "The custom encoding of the web view"
msgstr "La codifica personalizzata della vista web"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2520
+#: ../webkit/webkitwebview.cpp:3199
msgid "Icon URI"
msgstr "URI di icona"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2521
+#: ../webkit/webkitwebview.cpp:3200
msgid "The URI for the favicon for the #WebKitWebView."
msgstr "L'URI per la favicon della #WebKitWebView."
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:56
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:61
msgid "Submit"
msgstr "Invia"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:65
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:66
msgid "Reset"
msgstr "Azzera"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:71
msgid "This is a searchable index. Enter search keywords: "
msgstr ""
-"Questo indice consente ricerche. Inserire la parole chiave da cercare: "
+"Questo indice consente ricerche. Inserire le parole chiave da cercare: "
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:76
msgid "Choose File"
msgstr "Scelta file"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:80
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:81
msgid "(None)"
msgstr "(Nessuno)"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:85
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:86
msgid "Open Link in New _Window"
msgstr "Apri collegamento in nuova _finestra"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:90
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:91
msgid "_Download Linked File"
msgstr "_Scarica file collegato"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:95
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:96
msgid "Copy Link Loc_ation"
msgstr "Copia _posizione collegamento"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:100
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:101
msgid "Open _Image in New Window"
msgstr "Apri _immagine in nuova finestra"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:105
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:106
msgid "Sa_ve Image As"
msgstr "Sal_va immagine come"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:110
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:111
msgid "Cop_y Image"
msgstr "Copia i_mmagine"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:115
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:116
+msgid "Open _Video in New Window"
+msgstr "Apri _video in nuova finestra"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:121
+msgid "Open _Audio in New Window"
+msgstr "Apri _audio in nuova finestra"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:126
+msgid "Cop_y Video Link Location"
+msgstr "Copia _posizione collegamento video"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:131
+msgid "Cop_y Audio Link Location"
+msgstr "Copia _posizione collegamento audio"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:136
+msgid "_Toggle Media Controls"
+msgstr "Commu_ta controlli multimediali"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:141
+msgid "Toggle Media _Loop Playback"
+msgstr "Commuta _ripetizione multimediale"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:146
+msgid "Switch Video to _Fullscreen"
+msgstr "Mostra video a sc_hermo intero"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:151
+msgid "_Play"
+msgstr "_Riproduci"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:156
+msgid "_Pause"
+msgstr "_Pausa"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:161
+msgid "_Mute"
+msgstr "_Escludi audio"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:166
msgid "Open _Frame in New Window"
-msgstr "Apri c_ornice in nuova finestra"
+msgstr "Apri _frame in nuova finestra"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:166
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:217
msgid "_Reload"
msgstr "A_ggiorna"
# omesso Found
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:234
msgid "No Guesses Found"
msgstr "Nessun suggerimento"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:239
msgid "_Ignore Spelling"
msgstr "_Ignora ortografia"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:193
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:244
msgid "_Learn Spelling"
msgstr "A_pprendi ortografia"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:198
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:249
msgid "_Search the Web"
msgstr "_Cerca nel web"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:254
msgid "_Look Up in Dictionary"
msgstr "Consu_lta dizionario"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:259
msgid "_Open Link"
msgstr "_Apri collegamento"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:213
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:264
msgid "Ignore _Grammar"
msgstr "Ignora _grammatica"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:218
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:269
msgid "Spelling and _Grammar"
msgstr "Ortografia e _grammatica"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:274
msgid "_Show Spelling and Grammar"
msgstr "_Mostra ortografia e grammatica"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:274
msgid "_Hide Spelling and Grammar"
msgstr "_Nascondi ortografia e grammatica"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:279
msgid "_Check Document Now"
msgstr "_Controlla documento ora"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:284
msgid "Check Spelling While _Typing"
msgstr "Controlla ortografia durante _digitazione"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:289
msgid "Check _Grammar With Spelling"
msgstr "Controlla _grammatica con ortografia"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:294
msgid "_Font"
msgstr "_Tipo di carattere"
@@ -912,260 +1240,275 @@ msgstr "_Tipo di carattere"
# Le traduzioni di questi ultimi tre effetti per i font è presa
# dalle GTK_STOCK (_Grassetto, _Corsivo, _Sottolineato)
# Usato Co_ntorno come in OpenOffice.org
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:317
msgid "_Outline"
msgstr "Co_ntorno"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:322
msgid "Inspect _Element"
msgstr "Ispeziona _elemento"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:276
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:327
msgid "No recent searches"
msgstr "Nessuna ricerca recente"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:281
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:332
msgid "Recent searches"
msgstr "Ricerche recenti"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:286
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:337
msgid "_Clear recent searches"
msgstr "Pu_lisci ricerche recenti"
# String AXDefinitionListTermText()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:291
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:342
msgid "term"
msgstr "termine"
# String AXDefinitionListDefinitionText()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:296
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:347
msgid "definition"
msgstr "definizione"
# String AXButtonActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:352
msgid "press"
msgstr "premi"
# String AXRadioButtonActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:357
msgid "select"
msgstr "seleziona"
# String AXTextFieldActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:311
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:362
msgid "activate"
msgstr "attiva"
# String AXCheckedCheckBoxActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:316
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:367
msgid "uncheck"
msgstr "togli spunta"
# String AXUncheckedCheckBoxActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:321
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:372
msgid "check"
msgstr "metti spunta"
# String AXLinkActionVerb()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:326
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
msgid "jump"
msgstr "salta"
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:392
+msgid "Missing Plug-in"
+msgstr "Plugin mancante"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:398
+msgid "Plug-in Failure"
+msgstr "Fallimento plugin"
+
# String multipleFileUploadText(unsigned numberOfFiles)
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:342
+#. FIXME: If this file gets localized, this should really be localized as one string with a wildcard for the number.
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:404
msgid " files"
msgstr " file"
# String unknownFileSizeText()
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:347
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
msgid "Unknown"
msgstr "Sconosciuta"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:414
+#, c-format
+msgctxt "Title string for images"
+msgid "%s (%dx%d pixels)"
+msgstr "%s (%d×%d pixel)"
+
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
msgid "Loading..."
msgstr "Caricamento..."
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:431
msgid "Live Broadcast"
msgstr "Diffusione live"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:437
msgid "audio element controller"
msgstr "controllore elemento audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:439
msgid "video element controller"
msgstr "controllore elemento video"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:441
msgid "mute"
msgstr "escludi audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:443
msgid "unmute"
msgstr "abilita audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:445
msgid "play"
msgstr "riproduci"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:447
msgid "pause"
msgstr "pausa"
# name == "Slider"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:449
msgid "movie time"
msgstr "tempo filmato"
# name == "SliderThumb"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:451
msgid "timeline slider thumb"
msgstr "cursore dello scorrevole per linea temporale"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:453
msgid "back 30 seconds"
msgstr "indietro 30 secondi"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:455
msgid "return to realtime"
msgstr "ritorna a tempo effettivo"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:457
msgid "elapsed time"
msgstr "tempo trascorso"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:459
msgid "remaining time"
msgstr "tempo rimanente"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
msgid "status"
msgstr "stato"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:463
msgid "fullscreen"
msgstr "schermo intero"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:465
msgid "fast forward"
msgstr "avanti veloce"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:467
msgid "fast reverse"
msgstr "indietro veloce"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:469
msgid "show closed captions"
msgstr "mostra sottotitoli"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:471
msgid "hide closed captions"
msgstr "nascondi sottotitoli"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:480
msgid "audio element playback controls and status display"
msgstr "controlli di riproduzione e visualizzazione stato di elementi audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:482
msgid "video element playback controls and status display"
msgstr "controlli di riproduzione e visualizzazione stato di elementi video"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:484
msgid "mute audio tracks"
msgstr "escludi tracce audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:486
msgid "unmute audio tracks"
msgstr "abilita tracce audio"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:488
msgid "begin playback"
msgstr "inizia la riproduzione"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:490
msgid "pause playback"
msgstr "mette in pausa la riproduzione"
# non so se è corretto... per induzione dovrebbe
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:492
msgid "movie time scrubber"
msgstr "cambia con trascinamento il tempo del filmato"
# non so se è corretto... per induzione dovrebbe
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:494
msgid "movie time scrubber thumb"
msgstr "cursore per cambiare con trascinamento il tempo del filmato"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:496
msgid "seek movie back 30 seconds"
msgstr "posiziona il filmato indietro di 30 secondi"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:498
msgid "return streaming movie to real time"
msgstr "riporta il filmato in streaming al tempo reale"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:500
msgid "current movie time in seconds"
msgstr "tempo corrente del filmato in secondi"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
msgid "number of seconds of movie remaining"
msgstr "numero di secondi rimanenti del filmato"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:504
msgid "current movie status"
msgstr "stato attuale del filmato"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:506
msgid "seek quickly back"
msgstr "posiziona indietro rapidamente"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:508
msgid "seek quickly forward"
msgstr "posiziona avanti rapidamente"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:510
msgid "Play movie in fullscreen mode"
msgstr "Riproduce il filmato in modalità schermo intero"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
msgid "start displaying closed captions"
msgstr "avvia la visualizzazione dei sottotitoli"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:514
msgid "stop displaying closed captions"
msgstr "interrompe la visualizzazione dei sottotitoli"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:523
msgid "indefinite time"
msgstr "tempo indefinito"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:553
msgid "value missing"
msgstr "valore mancante"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:589
msgid "type mismatch"
msgstr "discrepanza di tipo"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:612
msgid "pattern mismatch"
msgstr "discrepanza di modello"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:617
msgid "too long"
msgstr "troppo lungo"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:622
msgid "range underflow"
msgstr "superamento limite inferiore dell'intervallo"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:627
msgid "range overflow"
msgstr "superamento limite superiore dell'intervallo"
-#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522
+#: ../../../WebCore/platform/gtk/LocalizedStringsGtk.cpp:632
msgid "step mismatch"
msgstr "discrepanza di passo"
diff --git a/Source/WebKit/gtk/tests/testapplicationcache.c b/Source/WebKit/gtk/tests/testapplicationcache.c
index 55e360c..2b022fc 100644
--- a/Source/WebKit/gtk/tests/testapplicationcache.c
+++ b/Source/WebKit/gtk/tests/testapplicationcache.c
@@ -37,25 +37,6 @@ static void test_application_cache_maximum_size()
g_assert(maxSize == webkit_application_cache_get_maximum_size());
}
-static void test_application_cache_database_directory_path()
-{
- unsigned long long maxSize = 8192;
- webkit_application_cache_set_maximum_size(maxSize);
-
- gchar* databaseDirectorySet = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
- webkit_application_cache_set_database_directory_path(databaseDirectorySet);
-
- // Creating a WebView - make sure that it didn't change anything
- WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
- g_object_ref_sink(webView);
- g_object_unref(webView);
-
- const gchar* databaseDirectoryGet = webkit_application_cache_get_database_directory_path();
- g_assert_cmpstr(databaseDirectorySet, ==, databaseDirectoryGet);
-
- g_free(databaseDirectorySet);
-}
-
int main(int argc, char** argv)
{
g_thread_init(NULL);
@@ -64,8 +45,6 @@ int main(int argc, char** argv)
g_test_bug_base("https://bugs.webkit.org/");
g_test_add_func("/webkit/application_cache/maximum_size",
test_application_cache_maximum_size);
- g_test_add_func("/webkit/application_cache/database_directory_path",
- test_application_cache_database_directory_path);
return g_test_run();
}
diff --git a/Source/WebKit/gtk/tests/testatk.c b/Source/WebKit/gtk/tests/testatk.c
index 79ca67d..161b4b8 100644
--- a/Source/WebKit/gtk/tests/testatk.c
+++ b/Source/WebKit/gtk/tests/testatk.c
@@ -52,7 +52,7 @@ static const char* comboBoxSelector = "<html><body><select><option selected valu
static const char* formWithTextInputs = "<html><body><form><input type='text' name='entry' /></form></body></html>";
-static const char* hypertextAndHyperlinks = "<html><body><p>A paragraph with no links at all</p><p><a href='http://foo.bar.baz/'>A line</a> with <a href='http://bar.baz.foo/'>a link in the middle</a> as well as at the beginning and <a href='http://baz.foo.bar/'>at the end</a></p></body></html>";
+static const char* hypertextAndHyperlinks = "<html><body><p>A paragraph with no links at all</p><p><a href='http://foo.bar.baz/'>A line</a> with <a href='http://bar.baz.foo/'>a link in the middle</a> as well as at the beginning and <a href='http://baz.foo.bar/'>at the end</a></p><ol><li>List item with a <span><a href='http://foo.bar.baz/'>link inside a span node</a></span></li></ol></body></html>";
static const char* layoutAndDataTables = "<html><body><table><tr><th>Odd</th><th>Even</th></tr><tr><td>1</td><td>2</td></tr></table><table><tr><td>foo</td><td>bar</td></tr></table></body></html>";
@@ -1405,6 +1405,25 @@ static void testWebkitAtkHypertextAndHyperlinks()
g_assert_cmpint(atk_hyperlink_get_n_anchors(hLink3), ==, 1);
g_assert_cmpstr(atk_hyperlink_get_uri(hLink3, 0), ==, "http://baz.foo.bar/");
+ AtkObject* list = atk_object_ref_accessible_child(object, 2);
+ g_assert(ATK_OBJECT(list));
+ g_assert(atk_object_get_role(list) == ATK_ROLE_LIST);
+ g_assert_cmpint(atk_object_get_n_accessible_children(list), ==, 1);
+
+ AtkObject* listItem = atk_object_ref_accessible_child(list, 0);
+ g_assert(ATK_IS_TEXT(listItem));
+ g_assert(ATK_IS_HYPERTEXT(listItem));
+
+ AtkHyperlink* hLinkInListItem = atk_hypertext_get_link(ATK_HYPERTEXT(listItem), 0);
+ g_assert(ATK_HYPERLINK(hLinkInListItem));
+ AtkObject* hLinkObject = atk_hyperlink_get_object(hLinkInListItem, 0);
+ g_assert(ATK_OBJECT(hLinkObject));
+ g_assert(atk_object_get_role(hLinkObject) == ATK_ROLE_LINK);
+ g_assert_cmpint(atk_hyperlink_get_start_index(hLinkInListItem), ==, 20);
+ g_assert_cmpint(atk_hyperlink_get_end_index(hLinkInListItem), ==, 43);
+ g_assert_cmpint(atk_hyperlink_get_n_anchors(hLinkInListItem), ==, 1);
+ g_assert_cmpstr(atk_hyperlink_get_uri(hLinkInListItem, 0), ==, "http://foo.bar.baz/");
+
/* Finally check the AtkAction interface for a given AtkHyperlink. */
g_assert(ATK_IS_ACTION(hLink1));
g_assert_cmpint(atk_action_get_n_actions(ATK_ACTION(hLink1)), ==, 1);
@@ -1414,6 +1433,8 @@ static void testWebkitAtkHypertextAndHyperlinks()
g_object_unref(paragraph1);
g_object_unref(paragraph2);
+ g_object_unref(list);
+ g_object_unref(listItem);
g_object_unref(webView);
}
diff --git a/Source/WebKit/gtk/tests/testdomdomwindow.c b/Source/WebKit/gtk/tests/testdomdomwindow.c
index b15558e..0d93408 100644
--- a/Source/WebKit/gtk/tests/testdomdomwindow.c
+++ b/Source/WebKit/gtk/tests/testdomdomwindow.c
@@ -105,7 +105,7 @@ static void load_event_callback(WebKitWebView* webView, GParamSpec* spec, DomDom
{
WebKitLoadStatus status = webkit_web_view_get_load_status(webView);
if (status == WEBKIT_LOAD_FINISHED) {
- g_signal_connect(fixture->domWindow, "click-event", G_CALLBACK(clickedCallback), fixture);
+ webkit_dom_event_target_add_event_listener(WEBKIT_DOM_EVENT_TARGET(fixture->domWindow), "click", G_CALLBACK(clickedCallback), false, fixture);
g_assert(fixture->clicked == FALSE);
gtk_test_widget_click(GTK_WIDGET(fixture->webView), 1, 0);
@@ -125,7 +125,7 @@ static void test_dom_domview_signals(DomDomviewFixture* fixture, gconstpointer d
fixture->domWindow = domWindow;
- g_signal_connect(fixture->domWindow, "load-event", G_CALLBACK(loadedCallback), fixture);
+ webkit_dom_event_target_add_event_listener(WEBKIT_DOM_EVENT_TARGET(fixture->domWindow), "load", G_CALLBACK(loadedCallback), false, fixture);
g_signal_connect(fixture->window, "map-event", G_CALLBACK(map_event_cb), fixture);
g_signal_connect(fixture->webView, "notify::load-status", G_CALLBACK(load_event_callback), fixture);
@@ -176,7 +176,7 @@ static void load_status_callback(WebKitWebView* webView, GParamSpec* spec, DomDo
fixture->domWindow, 0, 0, 0, clientX, clientY,
FALSE, FALSE, FALSE, FALSE,
1, WEBKIT_DOM_EVENT_TARGET(element));
- g_signal_connect(element, "click-event", G_CALLBACK(clicked_cb), fixture);
+ webkit_dom_event_target_add_event_listener(WEBKIT_DOM_EVENT_TARGET(element), "click", G_CALLBACK(clicked_cb), false, fixture);
g_assert(fixture->clicked == FALSE);
webkit_dom_event_target_dispatch_event(WEBKIT_DOM_EVENT_TARGET(element), event, NULL);
}
diff --git a/Source/WebKit/gtk/tests/testwebview.c b/Source/WebKit/gtk/tests/testwebview.c
index 778235d..97e8a50 100644
--- a/Source/WebKit/gtk/tests/testwebview.c
+++ b/Source/WebKit/gtk/tests/testwebview.c
@@ -266,7 +266,10 @@ static void do_test_webkit_web_view_adjustments(gboolean with_page_cache)
g_assert_cmpfloat(lower, ==, gtk_adjustment_get_lower(adjustment));
g_assert_cmpfloat(upper, ==, gtk_adjustment_get_upper(adjustment));
- g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0);
+ /* This assert is temporarily disabled until we fix the following bug: */
+ /* https://bugs.webkit.org/show_bug.cgi?id=57315 */
+ /* It should be re-enabled ASAP. */
+ /* g_assert_cmpfloat(gtk_adjustment_get_value(adjustment), ==, 100.0); */
g_free(effective_uri);
g_free(second_uri);
diff --git a/Source/WebKit/gtk/webkit/webkit.h b/Source/WebKit/gtk/webkit/webkit.h
index d85d698..77e96bc 100644
--- a/Source/WebKit/gtk/webkit/webkit.h
+++ b/Source/WebKit/gtk/webkit/webkit.h
@@ -30,6 +30,7 @@
#include <webkit/webkitgeolocationpolicydecision.h>
#include <webkit/webkitglobals.h>
#include <webkit/webkithittestresult.h>
+#include <webkit/webkiticondatabase.h>
#include <webkit/webkitnetworkrequest.h>
#include <webkit/webkitnetworkresponse.h>
#include <webkit/webkitsecurityorigin.h>
diff --git a/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp b/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp
index ab179b5..0b65d04 100644
--- a/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp
+++ b/Source/WebKit/gtk/webkit/webkitapplicationcache.cpp
@@ -26,8 +26,6 @@
#include <wtf/UnusedParam.h>
#include <wtf/text/CString.h>
-// keeps current directory path to offline web applications cache database
-static WTF::CString cacheDirectoryPath = "";
// web application cache maximum storage size
static unsigned long long cacheMaxSize = UINT_MAX;
@@ -89,33 +87,9 @@ G_CONST_RETURN gchar* webkit_application_cache_get_database_directory_path()
{
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
CString path = WebCore::fileSystemRepresentation(WebCore::cacheStorage().cacheDirectory());
-
- if (path != cacheDirectoryPath)
- cacheDirectoryPath = path;
-
- return cacheDirectoryPath.data();
+ return path.data();
#else
return "";
#endif
}
-/**
- * webkit_application_cache_set_database_directory_path:
- * @path: the new web application cache database path
- *
- * Sets the current path to the directory WebKit will write web aplication cache
- * databases.
- *
- * Since: 1.3.13
- **/
-void webkit_application_cache_set_database_directory_path(const gchar* path)
-{
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
- WTF::CString pathString(path);
- if (pathString != cacheDirectoryPath)
- cacheDirectoryPath = pathString;
-
- WebCore::cacheStorage().setCacheDirectory(WebCore::filenameToString(cacheDirectoryPath.data()));
-#endif
-}
-
diff --git a/Source/WebKit/gtk/webkit/webkitapplicationcache.h b/Source/WebKit/gtk/webkit/webkitapplicationcache.h
index 810a5d6..bb0f867 100644
--- a/Source/WebKit/gtk/webkit/webkitapplicationcache.h
+++ b/Source/WebKit/gtk/webkit/webkitapplicationcache.h
@@ -25,16 +25,13 @@
G_BEGIN_DECLS
WEBKIT_API unsigned long long
-webkit_application_cache_get_maximum_size();
+webkit_application_cache_get_maximum_size(void);
WEBKIT_API void
webkit_application_cache_set_maximum_size(unsigned long long size);
WEBKIT_API G_CONST_RETURN gchar*
-webkit_application_cache_get_database_directory_path (void);
-
-WEBKIT_API void
-webkit_application_cache_set_database_directory_path (const gchar* path);
+webkit_application_cache_get_database_directory_path(void);
G_END_DECLS
diff --git a/Source/WebKit/gtk/webkit/webkitdefines.h b/Source/WebKit/gtk/webkit/webkitdefines.h
index b0b607b..0b88084 100644
--- a/Source/WebKit/gtk/webkit/webkitdefines.h
+++ b/Source/WebKit/gtk/webkit/webkitdefines.h
@@ -41,6 +41,9 @@
G_BEGIN_DECLS
+typedef struct _WebKitIconDatabase WebKitIconDatabase;
+typedef struct _WebKitIconDatabaseClass WebKitIconDatabaseClass;
+
typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
diff --git a/Source/WebKit/gtk/webkit/webkitglobals.cpp b/Source/WebKit/gtk/webkit/webkitglobals.cpp
index 4d07ceb..b8d8b1f 100644
--- a/Source/WebKit/gtk/webkit/webkitglobals.cpp
+++ b/Source/WebKit/gtk/webkit/webkitglobals.cpp
@@ -40,6 +40,7 @@
#include "ResourceResponse.h"
#include "webkitapplicationcache.h"
#include "webkitglobalsprivate.h"
+#include "webkiticondatabase.h"
#include "webkitsoupauthdialog.h"
#include "webkitwebdatabase.h"
#include "webkitwebplugindatabaseprivate.h"
@@ -223,9 +224,24 @@ static GtkWidget* currentToplevelCallback(WebKitSoupAuthDialog* feature, SoupMes
return NULL;
}
-static void closeIconDatabaseOnExit()
+/**
+ * webkit_get_icon_database:
+ *
+ * Returns the #WebKitIconDatabase providing access to website icons.
+ *
+ * Return value: (transfer none): the current #WebKitIconDatabase
+ *
+ * Since: 1.3.13
+ */
+WebKitIconDatabase* webkit_get_icon_database()
{
- iconDatabase().close();
+ webkitInit();
+
+ static WebKitIconDatabase* database = 0;
+ if (!database)
+ database = WEBKIT_ICON_DATABASE(g_object_new(WEBKIT_TYPE_ICON_DATABASE, NULL));
+
+ return database;
}
void webkitInit()
@@ -249,14 +265,15 @@ void webkitInit()
gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
webkit_set_web_database_directory_path(databaseDirectory);
- webkit_application_cache_set_database_directory_path(databaseDirectory);
+ WebCore::cacheStorage().setCacheDirectory(databaseDirectory);
g_free(databaseDirectory);
PageGroup::setShouldTrackVisitedLinks(true);
Pasteboard::generalPasteboard()->setHelper(WebKit::pasteboardHelperInstance());
- WebKit::setIconDatabaseEnabled(true);
+ GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
+ webkit_icon_database_set_path(webkit_get_icon_database(), iconDatabasePath.get());
SoupSession* session = webkit_get_default_session();
@@ -280,25 +297,5 @@ PasteboardHelperGtk* pasteboardHelperInstance()
return helper;
}
-void setIconDatabaseEnabled(bool enabled)
-{
- static bool initialized = false;
- if (enabled && !initialized) {
- initialized = true;
- atexit(closeIconDatabaseOnExit);
- }
-
- if (enabled) {
- iconDatabase().setEnabled(true);
- GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
- iconDatabase().open(iconDatabasePath.get());
- return;
- }
-
- iconDatabase().setEnabled(false);
- iconDatabase().close();
-}
-
-
} /** end namespace WebKit */
diff --git a/Source/WebKit/gtk/webkit/webkitglobals.h b/Source/WebKit/gtk/webkit/webkitglobals.h
index 612c195..33d2b8b 100644
--- a/Source/WebKit/gtk/webkit/webkitglobals.h
+++ b/Source/WebKit/gtk/webkit/webkitglobals.h
@@ -58,6 +58,9 @@ webkit_get_default_session (void);
WEBKIT_API WebKitWebPluginDatabase *
webkit_get_web_plugin_database (void);
+WEBKIT_API WebKitIconDatabase *
+webkit_get_icon_database (void);
+
WEBKIT_API void
webkit_set_cache_model (WebKitCacheModel cache_model);
diff --git a/Source/WebKit/gtk/webkit/webkitglobalsprivate.h b/Source/WebKit/gtk/webkit/webkitglobalsprivate.h
index 7eb3aae..5923f2e 100644
--- a/Source/WebKit/gtk/webkit/webkitglobalsprivate.h
+++ b/Source/WebKit/gtk/webkit/webkitglobalsprivate.h
@@ -33,7 +33,6 @@ namespace WebKit {
class PasteboardHelperGtk;
PasteboardHelperGtk* pasteboardHelperInstance();
-void setIconDatabaseEnabled(bool);
}
extern "C" {
diff --git a/Source/WebKit/gtk/webkit/webkiticondatabase.cpp b/Source/WebKit/gtk/webkit/webkiticondatabase.cpp
new file mode 100644
index 0000000..397bd51
--- /dev/null
+++ b/Source/WebKit/gtk/webkit/webkiticondatabase.cpp
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2011 Christian Dywan <christian@lanedo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "webkiticondatabase.h"
+
+#include "DatabaseDetails.h"
+#include "DatabaseTracker.h"
+#include "FileSystem.h"
+#include "IconDatabase.h"
+#include "Image.h"
+#include "IntSize.h"
+#include "webkitglobalsprivate.h"
+#include "webkitmarshal.h"
+#include "webkitsecurityoriginprivate.h"
+#include "webkitwebframe.h"
+#include <glib/gi18n-lib.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/text/CString.h>
+
+/**
+ * SECTION:webkitwebdatabase
+ * @short_description: A WebKit web application database
+ *
+ * #WebKitIconDatabase provides access to website icons, as shown
+ * in tab labels, window captions or bookmarks. All views share
+ * the same icon database.
+ *
+ * The icon database is enabled by default and stored in
+ * ~/.local/share/webkit/icondatabase, depending on XDG_DATA_HOME.
+ *
+ * WebKit will automatically look for available icons in link elements
+ * on opened pages as well as an existing favicon.ico and load the
+ * images found into the memory cache if possible. The signal "icon-loaded"
+ * will be emitted when any icon is found and loaded.
+ * Old Icons are automatically cleaned up after 4 days.
+ *
+ * webkit_icon_database_set_path() can be used to change the location
+ * of the database and also to disable it by passing %NULL.
+ *
+ * If WebKitWebSettings::enable-private-browsing is %TRUE new icons
+ * won't be added to the database on disk and no existing icons will
+ * be deleted from it.
+ *
+ * Since: 1.3.13
+ */
+
+using namespace WebKit;
+
+enum {
+ PROP_0,
+
+ PROP_PATH,
+};
+
+enum {
+ ICON_LOADED,
+
+ LAST_SIGNAL
+};
+
+static guint webkit_icon_database_signals[LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE(WebKitIconDatabase, webkit_icon_database, G_TYPE_OBJECT);
+
+struct _WebKitIconDatabasePrivate {
+ GOwnPtr<gchar> path;
+};
+
+static void webkit_icon_database_finalize(GObject* object)
+{
+ // Call C++ destructors, the reverse of 'placement new syntax'
+ WEBKIT_ICON_DATABASE(object)->priv->~WebKitIconDatabasePrivate();
+
+ G_OBJECT_CLASS(webkit_icon_database_parent_class)->finalize(object);
+}
+
+static void webkit_icon_database_dispose(GObject* object)
+{
+ G_OBJECT_CLASS(webkit_icon_database_parent_class)->dispose(object);
+}
+
+static void webkit_icon_database_set_property(GObject* object, guint propId, const GValue* value, GParamSpec* pspec)
+{
+ WebKitIconDatabase* database = WEBKIT_ICON_DATABASE(object);
+
+ switch (propId) {
+ case PROP_PATH:
+ webkit_icon_database_set_path(database, g_value_get_string(value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, pspec);
+ break;
+ }
+}
+
+static void webkit_icon_database_get_property(GObject* object, guint propId, GValue* value, GParamSpec* pspec)
+{
+ WebKitIconDatabase* database = WEBKIT_ICON_DATABASE(object);
+
+ switch (propId) {
+ case PROP_PATH:
+ g_value_set_string(value, webkit_icon_database_get_path(database));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, pspec);
+ break;
+ }
+}
+
+static void webkit_icon_database_class_init(WebKitIconDatabaseClass* klass)
+{
+ webkitInit();
+
+ GObjectClass* gobjectClass = G_OBJECT_CLASS(klass);
+ gobjectClass->dispose = webkit_icon_database_dispose;
+ gobjectClass->finalize = webkit_icon_database_finalize;
+ gobjectClass->set_property = webkit_icon_database_set_property;
+ gobjectClass->get_property = webkit_icon_database_get_property;
+
+ /**
+ * WebKitIconDatabase:path:
+ *
+ * The absolute path of the icon database folder.
+ *
+ * Since: 1.3.13
+ */
+ g_object_class_install_property(gobjectClass, PROP_PATH,
+ g_param_spec_string("path",
+ _("Path"),
+ _("The absolute path of the icon database folder"),
+ NULL,
+ WEBKIT_PARAM_READWRITE));
+
+ /**
+ * WebKitIconDatabase::icon-loaded:
+ * @database: the object on which the signal is emitted
+ * @frame: the frame containing the icon
+ * @frame_uri: the URI of the frame containing the icon
+ *
+ * This signal is emitted when a favicon is available for a page,
+ * or a child frame.
+ * See WebKitWebView::icon-loaded if you only need the favicon for
+ * the main frame of a particular #WebKitWebView.
+ *
+ * Since: 1.3.13
+ */
+ webkit_icon_database_signals[ICON_LOADED] = g_signal_new("icon-loaded",
+ G_TYPE_FROM_CLASS(klass),
+ (GSignalFlags)G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ webkit_marshal_VOID__OBJECT_STRING,
+ G_TYPE_NONE, 2,
+ WEBKIT_TYPE_WEB_FRAME,
+ G_TYPE_STRING);
+
+ g_type_class_add_private(klass, sizeof(WebKitIconDatabasePrivate));
+}
+
+static void webkit_icon_database_init(WebKitIconDatabase* database)
+{
+ database->priv = G_TYPE_INSTANCE_GET_PRIVATE(database, WEBKIT_TYPE_ICON_DATABASE, WebKitIconDatabasePrivate);
+ // 'placement new syntax', see webkitwebview.cpp
+ new (database->priv) WebKitIconDatabasePrivate();
+}
+
+/**
+ * webkit_icon_database_get_path:
+ * @database: a #WebKitIconDatabase
+ *
+ * Determines the absolute path to the database folder on disk.
+ *
+ * Returns: the absolute path of the database folder, or %NULL
+ *
+ * Since: 1.3.13
+ **/
+G_CONST_RETURN gchar* webkit_icon_database_get_path(WebKitIconDatabase* database)
+{
+ g_return_val_if_fail(WEBKIT_IS_ICON_DATABASE(database), 0);
+
+ return database->priv->path.get();
+}
+
+static void closeIconDatabaseOnExit()
+{
+ if (WebCore::iconDatabase().isEnabled()) {
+ WebCore::iconDatabase().setEnabled(false);
+ WebCore::iconDatabase().close();
+ }
+}
+
+/**
+ * webkit_icon_database_set_path:
+ * @database: a #WebKitIconDatabase
+ * @path: an absolute path to the icon database folder
+ *
+ * Specifies the absolute path to the database folder on disk.
+ *
+ * Passing %NULL or "" disables the icon database.
+ *
+ * Since: 1.3.13
+ **/
+void webkit_icon_database_set_path(WebKitIconDatabase* database, const gchar* path)
+{
+ g_return_if_fail(WEBKIT_IS_ICON_DATABASE(database));
+
+ if (database->priv->path.get())
+ WebCore::iconDatabase().close();
+
+ if (!(path && path[0])) {
+ database->priv->path.set(0);
+ WebCore::iconDatabase().setEnabled(false);
+ return;
+ }
+
+ database->priv->path.set(g_strdup(path));
+
+ WebCore::iconDatabase().setEnabled(true);
+ WebCore::iconDatabase().open(WebCore::filenameToString(database->priv->path.get()), WebCore::IconDatabase::defaultDatabaseFilename());
+
+ static bool initialized = false;
+ if (!initialized) {
+ atexit(closeIconDatabaseOnExit);
+ initialized = true;
+ }
+}
+
+/**
+ * webkit_icon_database_get_icon_uri:
+ * @database: a #WebKitIconDatabase
+ * @page_uri: URI of the page containing the icon
+ *
+ * Obtains the URI for the favicon for the given page URI.
+ * See also webkit_web_view_get_icon_uri().
+ *
+ * Returns: a newly allocated URI for the favicon, or %NULL
+ *
+ * Since: 1.3.13
+ **/
+gchar* webkit_icon_database_get_icon_uri(WebKitIconDatabase* database, const gchar* pageURI)
+{
+ g_return_val_if_fail(WEBKIT_IS_ICON_DATABASE(database), 0);
+ g_return_val_if_fail(pageURI, 0);
+
+ String pageURL = String::fromUTF8(pageURI);
+ return g_strdup(WebCore::iconDatabase().synchronousIconURLForPageURL(pageURL).utf8().data());
+}
+
+/**
+ * webkit_icon_database_get_icon_pixbuf:
+ * @database: a #WebKitIconDatabase
+ * @page_uri: URI of the page containing the icon
+ *
+ * Obtains a #GdkPixbuf of the favicon for the given page URI, or
+ * a default icon if there is no icon for the given page. Use
+ * webkit_icon_database_get_icon_uri() if you need to distinguish these cases.
+ * Usually you want to connect to WebKitIconDatabase::icon-loaded and call this
+ * method in the callback.
+ *
+ * The pixbuf will have the largest size provided by the server and should
+ * be resized before it is displayed.
+ * See also webkit_web_view_get_icon_pixbuf().
+ *
+ * Returns: (transfer full): a new reference to a #GdkPixbuf, or %NULL
+ *
+ * Since: 1.3.13
+ **/
+GdkPixbuf* webkit_icon_database_get_icon_pixbuf(WebKitIconDatabase* database, const gchar* pageURI)
+{
+ g_return_val_if_fail(WEBKIT_IS_ICON_DATABASE(database), 0);
+ g_return_val_if_fail(pageURI, 0);
+
+ String pageURL = String::fromUTF8(pageURI);
+ // The exact size we pass is irrelevant to the WebCore::iconDatabase code.
+ // We must pass something greater than 0, 0 to get a pixbuf.
+ WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(pageURL, WebCore::IntSize(16, 16));
+ if (!icon)
+ return 0;
+ GdkPixbuf* pixbuf = icon->getGdkPixbuf();
+ if (!pixbuf)
+ return 0;
+ return static_cast<GdkPixbuf*>(g_object_ref(pixbuf));
+}
+
+/**
+ * webkit_icon_database_clear():
+ * @database: a #WebKitIconDatabase
+ *
+ * Clears all icons from the database.
+ *
+ * Since: 1.3.13
+ **/
+void webkit_icon_database_clear(WebKitIconDatabase* database)
+{
+ g_return_if_fail(WEBKIT_IS_ICON_DATABASE(database));
+
+ WebCore::iconDatabase().removeAllIcons();
+}
+
diff --git a/Source/WebKit/gtk/webkit/webkiticondatabase.h b/Source/WebKit/gtk/webkit/webkiticondatabase.h
new file mode 100644
index 0000000..7fe5acd
--- /dev/null
+++ b/Source/WebKit/gtk/webkit/webkiticondatabase.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2011 Christian Dywan <christian@lanedo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef webkiticondatabase_h
+#define webkiticondatabase_h
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <glib-object.h>
+#include <webkit/webkitdefines.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_ICON_DATABASE (webkit_icon_database_get_type())
+#define WEBKIT_ICON_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_ICON_DATABASE, WebKitIconDatabase))
+#define WEBKIT_ICON_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_ICON_DATABASE, WebKitIconDatabaseClass))
+#define WEBKIT_IS_ICON_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_ICON_DATABASE))
+#define WEBKIT_IS_ICON_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_ICON_DATABASE))
+#define WEBKIT_ICON_DATABASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_ICON_DATABASE, WebKitIconDatabaseClass))
+
+typedef struct _WebKitIconDatabasePrivate WebKitIconDatabasePrivate;
+
+struct _WebKitIconDatabase {
+ GObject parent_instance;
+
+ /*< private >*/
+ WebKitIconDatabasePrivate* priv;
+};
+
+struct _WebKitIconDatabaseClass {
+ GObjectClass parent_class;
+
+ /* Padding for future expansion */
+ void (*_webkit_reserved1) (void);
+ void (*_webkit_reserved2) (void);
+ void (*_webkit_reserved3) (void);
+ void (*_webkit_reserved4) (void);
+};
+
+WEBKIT_API GType
+webkit_icon_database_get_type (void);
+
+WEBKIT_API G_CONST_RETURN gchar*
+webkit_icon_database_get_path (WebKitIconDatabase* database);
+
+WEBKIT_API void
+webkit_icon_database_set_path (WebKitIconDatabase* database,
+ const gchar* path);
+
+WEBKIT_API gchar*
+webkit_icon_database_get_icon_uri (WebKitIconDatabase* database,
+ const gchar* page_uri);
+
+WEBKIT_API GdkPixbuf*
+webkit_icon_database_get_icon_pixbuf (WebKitIconDatabase* database,
+ const gchar* page_uri);
+
+WEBKIT_API void
+webkit_icon_database_clear (WebKitIconDatabase* database);
+
+G_END_DECLS
+
+#endif /* webkiticondatabase_h */
diff --git a/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp b/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
index 9a98e44..742cddd 100644
--- a/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
+++ b/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
@@ -542,7 +542,7 @@ void webkitViewportAttributesRecompute(WebKitViewportAttributes* viewportAttribu
priv->minimumScaleFactor = attributes.minimumScale;
priv->maximumScaleFactor = attributes.maximumScale;
priv->devicePixelRatio = attributes.devicePixelRatio;
- priv->userScalable = arguments.userScalable;
+ priv->userScalable = static_cast<bool>(arguments.userScalable);
if (!priv->isValid) {
priv->isValid = TRUE;
diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
index fd90a6c..a0e40b3 100644
--- a/Source/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -44,6 +44,7 @@
#include "JSDOMBinding.h"
#include "JSDOMWindow.h"
#include "JSElement.h"
+#include "PlatformContextCairo.h"
#include "PrintContext.h"
#include "RenderListItem.h"
#include "RenderTreeAsText.h"
@@ -765,17 +766,17 @@ static void begin_print_callback(GtkPrintOperation* op, GtkPrintContext* context
gtk_print_operation_set_n_pages(op, printContext->pageCount());
}
-static void draw_page_callback(GtkPrintOperation* op, GtkPrintContext* context, gint page_nr, gpointer user_data)
+static void draw_page_callback(GtkPrintOperation*, GtkPrintContext* gtkPrintContext, gint pageNumber, PrintContext* corePrintContext)
{
- PrintContext* printContext = reinterpret_cast<PrintContext*>(user_data);
-
- if (page_nr >= static_cast<gint>(printContext->pageCount()))
+ if (pageNumber >= static_cast<gint>(corePrintContext->pageCount()))
return;
- cairo_t* cr = gtk_print_context_get_cairo_context(context);
- GraphicsContext ctx(cr);
- float width = gtk_print_context_get_width(context);
- printContext->spoolPage(ctx, page_nr, width);
+ cairo_t* cr = gtk_print_context_get_cairo_context(gtkPrintContext);
+ float pageWidth = gtk_print_context_get_width(gtkPrintContext);
+
+ PlatformContextCairo platformContext(cr);
+ GraphicsContext graphicsContext(&platformContext);
+ corePrintContext->spoolPage(graphicsContext, pageNumber, pageWidth);
}
static void end_print_callback(GtkPrintOperation* op, GtkPrintContext* context, gpointer user_data)
diff --git a/Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp b/Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
index 2d36115..1ed5205 100644
--- a/Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
@@ -74,7 +74,8 @@ static void webkit_web_plugin_database_init(WebKitWebPluginDatabase* database)
*/
void webkit_web_plugin_database_plugins_list_free(GSList* list)
{
- g_return_if_fail(list);
+ if (!list)
+ return;
for (GSList* p = list; p; p = p->next)
g_object_unref(p->data);
diff --git a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
index 7e7a506..3b4cf57 100644
--- a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -39,6 +39,8 @@
#if OS(UNIX)
#include <sys/utsname.h>
+#elif OS(WINDOWS)
+#include "SystemInfo.h"
#endif
/**
@@ -110,6 +112,7 @@ struct _WebKitWebSettingsPrivate {
gboolean enable_java_applet;
gboolean enable_hyperlink_auditing;
gboolean enable_fullscreen;
+ gboolean enable_dns_prefetching;
};
#define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
@@ -162,7 +165,8 @@ enum {
PROP_AUTO_RESIZE_WINDOW,
PROP_ENABLE_JAVA_APPLET,
PROP_ENABLE_HYPERLINK_AUDITING,
- PROP_ENABLE_FULLSCREEN
+ PROP_ENABLE_FULLSCREEN,
+ PROP_ENABLE_DNS_PREFETCHING
};
// Create a default user agent string
@@ -208,7 +212,7 @@ static String webkitOSVersion()
else
uaOSVersion = String("Unknown");
#elif OS(WINDOWS)
- DEFINE_STATIC_LOCAL(const String, uaOSVersion, (String("Windows")));
+ DEFINE_STATIC_LOCAL(const String, uaOSVersion, (windowsVersionForUAString()));
#else
DEFINE_STATIC_LOCAL(const String, uaOSVersion, (String("Unknown")));
#endif
@@ -909,6 +913,22 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
FALSE,
flags));
+ /**
+ * WebKitWebSettings:enable-dns-prefetching
+ *
+ * Whether webkit prefetches domain names. This is a separate knob from private browsing.
+ * Whether private browsing should set this or not is up for debate, for now it doesn't.
+ *
+ * Since: 1.3.13.
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_ENABLE_DNS_PREFETCHING,
+ g_param_spec_boolean("enable-dns-prefetching",
+ _("WebKit prefetches domain names"),
+ _("Whether WebKit prefetches domain names"),
+ TRUE,
+ flags));
+
g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
}
@@ -1094,6 +1114,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con
case PROP_ENABLE_FULLSCREEN:
priv->enable_fullscreen = g_value_get_boolean(value);
break;
+ case PROP_ENABLE_DNS_PREFETCHING:
+ priv->enable_dns_prefetching = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1244,6 +1267,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa
case PROP_ENABLE_FULLSCREEN:
g_value_set_boolean(value, priv->enable_fullscreen);
break;
+ case PROP_ENABLE_DNS_PREFETCHING:
+ g_value_set_boolean(value, priv->enable_dns_prefetching);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1320,6 +1346,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
"enable-java-applet", priv->enable_java_applet,
"enable-hyperlink-auditing", priv->enable_hyperlink_auditing,
"enable-fullscreen", priv->enable_fullscreen,
+ "enable-dns-prefetching", priv->enable_dns_prefetching,
NULL));
return copy;
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp
index 0ffc9d9..bf74d7b 100644
--- a/Source/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp
@@ -85,6 +85,7 @@
#include "webkitgeolocationpolicydecision.h"
#include "webkitglobalsprivate.h"
#include "webkithittestresultprivate.h"
+#include "webkiticondatabase.h"
#include "webkitmarshal.h"
#include "webkitnetworkrequest.h"
#include "webkitnetworkresponse.h"
@@ -709,8 +710,8 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose*
frame->view()->updateLayoutAndStyleIfNeededRecursive();
RefPtr<cairo_t> cr = adoptRef(gdk_cairo_create(event->window));
- GraphicsContext ctx(cr.get());
- ctx.setGdkExposeEvent(event);
+ GraphicsContext gc(cr.get());
+ gc.setGdkExposeEvent(event);
int rectCount;
GOwnPtr<GdkRectangle> rects;
@@ -719,7 +720,7 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose*
for (int i = 0; i < rectCount; i++)
paintRects.append(IntRect(rects.get()[i]));
- paintWebView(frame, priv->transparent, ctx, static_cast<IntRect>(event->area), paintRects);
+ paintWebView(frame, priv->transparent, gc, static_cast<IntRect>(event->area), paintRects);
}
return FALSE;
@@ -736,7 +737,7 @@ static gboolean webkit_web_view_draw(GtkWidget* widget, cairo_t* cr)
Frame* frame = core(webView)->mainFrame();
if (frame->contentRenderer() && frame->view()) {
- GraphicsContext ctx(cr);
+ GraphicsContext gc(cr);
IntRect rect = clipRect;
cairo_rectangle_list_t* rectList = cairo_copy_clip_rectangle_list(cr);
@@ -747,7 +748,7 @@ static gboolean webkit_web_view_draw(GtkWidget* widget, cairo_t* cr)
for (int i = 0; i < rectList->num_rectangles; i++)
rects.append(enclosingIntRect(FloatRect(rectList->rectangles[i])));
}
- paintWebView(frame, priv->transparent, ctx, rect, rects);
+ paintWebView(frame, priv->transparent, gc, rect, rects);
cairo_rectangle_list_destroy(rectList);
}
@@ -2315,6 +2316,8 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
* @icon_uri: the URI for the icon
*
* This signal is emitted when the main frame has got a favicon.
+ * See WebKitIconDatabase::icon-loaded if you want to keep track of
+ * icons for child frames.
*
* Since: 1.1.18
*/
@@ -3290,7 +3293,8 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
javaScriptCanAccessClipboard, enableOfflineWebAppCache,
enableUniversalAccessFromFileURI, enableFileAccessFromFileURI,
enableDOMPaste, tabKeyCyclesThroughElements,
- enableSiteSpecificQuirks, usePageCache, enableJavaApplet, enableHyperlinkAuditing, enableFullscreen;
+ enableSiteSpecificQuirks, usePageCache, enableJavaApplet,
+ enableHyperlinkAuditing, enableFullscreen, enableDNSPrefetching;
WebKitEditingBehavior editingBehavior;
@@ -3331,6 +3335,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
"enable-hyperlink-auditing", &enableHyperlinkAuditing,
"spell-checking-languages", &defaultSpellCheckingLanguages,
"enable-fullscreen", &enableFullscreen,
+ "enable-dns-prefetching", &enableDNSPrefetching,
NULL);
settings->setDefaultTextEncodingName(defaultEncoding);
@@ -3375,6 +3380,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
WebKit::EditorClient* client = static_cast<WebKit::EditorClient*>(core(webView)->editorClient());
static_cast<WebKit::TextCheckerClientEnchant*>(client->textChecker())->updateSpellCheckingLanguage(defaultSpellCheckingLanguages);
#endif
+ settings->setDNSPrefetchingEnabled(enableDNSPrefetching);
Page* page = core(webView);
if (page)
@@ -3441,6 +3447,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
settings->setJavaScriptEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-plugins"))
settings->setPluginsEnabled(g_value_get_boolean(&value));
+ else if (name == g_intern_string("enable-dns-prefetching"))
+ settings->setDNSPrefetchingEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("resizable-text-areas"))
settings->setTextAreasAreResizable(g_value_get_boolean(&value));
else if (name == g_intern_string("user-stylesheet-uri"))
@@ -4337,8 +4345,7 @@ gboolean webkit_web_view_get_editable(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- Frame* frame = core(webView)->mainFrame();
- return frame && frame->document()->inDesignMode();
+ return core(webView)->isEditable();
}
/**
@@ -4363,15 +4370,14 @@ void webkit_web_view_set_editable(WebKitWebView* webView, gboolean flag)
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- Frame* frame = core(webView)->mainFrame();
- g_return_if_fail(frame);
-
- // TODO: What happens when the frame is replaced?
flag = flag != FALSE;
if (flag == webkit_web_view_get_editable(webView))
return;
- frame->document()->setDesignMode(flag ? WebCore::Document::on : WebCore::Document::off);
+ core(webView)->setEditable(flag);
+
+ Frame* frame = core(webView)->mainFrame();
+ g_return_if_fail(frame);
if (flag) {
frame->editor()->applyEditingStyleToBodyElement();
@@ -5058,12 +5064,41 @@ WebKitHitTestResult* webkit_web_view_get_hit_test_result(WebKitWebView* webView,
G_CONST_RETURN gchar* webkit_web_view_get_icon_uri(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
- String iconURL = iconDatabase().iconURLForPageURL(core(webView)->mainFrame()->document()->url().prettyURL());
+ String iconURL = iconDatabase().synchronousIconURLForPageURL(core(webView)->mainFrame()->document()->url().prettyURL());
webView->priv->iconURI = iconURL.utf8();
return webView->priv->iconURI.data();
}
/**
+ * webkit_web_view_get_icon_pixbuf:
+ * @webView: the #WebKitWebView object
+ *
+ * Obtains a #GdkPixbuf of the favicon for the given #WebKitWebView, or
+ * a default icon if there is no icon for the given page. Use
+ * webkit_web_view_get_icon_uri() if you need to distinguish these cases.
+ * Usually you want to connect to WebKitWebView::icon-loaded and call this
+ * method in the callback.
+ *
+ * The pixbuf will have the largest size provided by the server and should
+ * be resized before it is displayed.
+ * See also webkit_icon_database_get_icon_pixbuf().
+ *
+ * Returns: (transfer full): a new reference to a #GdkPixbuf, or %NULL
+ *
+ * Since: 1.3.13
+ */
+GdkPixbuf* webkit_web_view_get_icon_pixbuf(WebKitWebView* webView)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
+
+ const gchar* pageURI = webkit_web_view_get_uri(webView);
+ WebKitIconDatabase* database = webkit_get_icon_database();
+ return webkit_icon_database_get_icon_pixbuf(database, pageURI);
+}
+
+
+
+/**
* webkit_web_view_get_dom_document:
* @webView: a #WebKitWebView
*
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.h b/Source/WebKit/gtk/webkit/webkitwebview.h
index 1838bfe..38c9a70 100644
--- a/Source/WebKit/gtk/webkit/webkitwebview.h
+++ b/Source/WebKit/gtk/webkit/webkitwebview.h
@@ -397,6 +397,9 @@ webkit_web_view_get_hit_test_result (WebKitWebView *webView,
WEBKIT_API G_CONST_RETURN gchar *
webkit_web_view_get_icon_uri (WebKitWebView *webView);
+WEBKIT_API GdkPixbuf *
+webkit_web_view_get_icon_pixbuf (WebKitWebView *webView);
+
WEBKIT_API WebKitDOMDocument *
webkit_web_view_get_dom_document (WebKitWebView *webView);
generated by cgit v1.1 at 2024-05-29 03:33:02 +0000