diff options
Diffstat (limited to 'WebKit/gtk')
22 files changed, 451 insertions, 209 deletions
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog index 3d3436f..dbba4a9 100644 --- a/WebKit/gtk/ChangeLog +++ b/WebKit/gtk/ChangeLog @@ -1,3 +1,123 @@ +2010-08-06 Gavin Barraclough <barraclough@apple.com> + + Rubber stamped by Sam Weinig + + Bug 43594 - Add string forwards to Forward.h + This allows us to remove forward declarations for these classes from + WebCore/WebKit (a step in moving these class from WebCore:: to WTF::). + + * WebCoreSupport/InspectorClientGtk.h: + +2010-08-09 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Xan Lopez. + + [gtk] gtk_im_context_focus_in() should only be called when an input-able element has focus + https://bugs.webkit.org/show_bug.cgi?id=43602 + + Only call gtk_im_context_focus_in() when we focus a frame which is currently in + an editable node. + + * webkit/webkitwebview.cpp: + (webkit_web_view_focus_in_event): Conditionalize call to gtk_im_context_focus_in(). + +2010-08-06 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> + + Reviewed by Xan Lopez. + + Use the new paths, and also fix the path for localizedStrings. + + * WebCoreSupport/InspectorClientGtk.cpp: + (WebKit::InspectorClient::openInspectorFrontend): + (WebKit::InspectorFrontendClient::localizedStringsURL): + +2010-08-06 Jessie Berlin <jberlin@apple.com> + + Roll out http://trac.webkit.org/changeset/64801, which broke the Safari Windows Build. + Unreviewed. + + * WebCoreSupport/InspectorClientGtk.h: + +2010-08-05 Xan Lopez <xlopez@igalia.com> + + Reviewed by Gustavo Noronha. + + [GTK] Use correct path for Inspector data files in GTK+3.x builds + https://bugs.webkit.org/show_bug.cgi?id=43445 + + Use the right data path for inspector files when building with + GTK+ 3.x. + + * WebCoreSupport/InspectorClientGtk.cpp: + (WebKit::InspectorClient::openInspectorFrontend): + +2010-08-03 Daniel Bates <dbates@rim.com> + + Fix misspelled word 'teh' in the description of the XSS Auditor setting. + + * webkit/webkitwebsettings.cpp: + (webkit_web_settings_class_init): + +2010-08-03 Xan Lopez <xlopez@igalia.com> + + Reviewed by Gustavo Noronha. + + [GTK] Fix DOM event dispatch + https://bugs.webkit.org/show_bug.cgi?id=40847 + + Test DOM event dispatch. + + * tests/testdomdomwindow.c: + (load_event_callback): + (test_dom_domview_signals): + (clicked_cb): + (load_status_callback): + (test_dom_domview_dispatch_event): + (main): + +2010-08-03 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> + + Reviewed by Xan Lopez. + + [GTK] Does not paint the node highlight used by the inspector + https://bugs.webkit.org/show_bug.cgi?id=43429 + + Implement highlighting the nodes when using the inspector. + + * WebCoreSupport/InspectorClientGtk.cpp: + (WebKit::InspectorClient::highlight): + (WebKit::InspectorClient::hideHighlight): + * webkit/webkitwebview.cpp: + (webkit_web_view_expose_event): + +2010-08-03 Xan Lopez <xlopez@igalia.com> + + Reviewed by Gustavo Noronha. + + Update unit tests now that string parameters are 'const char*'. + + * tests/testdomdocument.c: + (test_dom_document_title): + (test_dom_document_get_elements_by_tag_name): + (test_dom_document_get_elements_by_class_name): + (test_dom_document_get_element_by_id): + * tests/testdomnode.c: + (test_dom_node_insertion): + +2010-08-02 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] DRT implement execCommand() + https://bugs.webkit.org/show_bug.cgi?id=35351 + + * webkit/webkitprivate.h: Add some private methods for the DRT which enable + LayoutTestController.execCommand and LayoutTestController.isCommandEnabled: + webkit_web_view_execute_core_command_by_name and webkit_web_view_is_command_enabled. + * webkit/webkitwebview.cpp: + (webkit_web_view_execute_core_command_by_name): added. + (webkit_web_view_is_command_enabled): Added. + 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> Reviewed by Darin Fisher. @@ -120,7 +240,6 @@ * WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::reachedApplicationCacheOriginQuota): * WebCoreSupport/ChromeClientGtk.h: - 2010-07-26 Steve Block <steveblock@google.com> Reviewed by Jeremy Orlow. diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp index 081c942..a06d637 100644 --- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp @@ -277,12 +277,12 @@ bool ChromeClient::canRunBeforeUnloadConfirmPanel() return true; } -bool ChromeClient::runBeforeUnloadConfirmPanel(const WebCore::String& message, WebCore::Frame* frame) +bool ChromeClient::runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame) { return runJavaScriptConfirm(frame, message); } -void ChromeClient::addMessageToConsole(WebCore::MessageSource source, WebCore::MessageType type, WebCore::MessageLevel level, const WebCore::String& message, unsigned int lineNumber, const WebCore::String& sourceId) +void ChromeClient::addMessageToConsole(WebCore::MessageSource source, WebCore::MessageType type, WebCore::MessageLevel level, const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceId) { gboolean retval; g_signal_emit_by_name(m_webView, "console-message", message.utf8().data(), lineNumber, sourceId.utf8().data(), &retval); @@ -596,7 +596,7 @@ void ChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser) gtk_widget_destroy(dialog); } -void ChromeClient::chooseIconForFiles(const Vector<WebCore::String>& filenames, WebCore::FileChooser* chooser) +void ChromeClient::chooseIconForFiles(const Vector<WTF::String>& filenames, WebCore::FileChooser* chooser) { chooser->iconLoaded(Icon::createIconForFiles(filenames)); } diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h index 8c667c4..e3be1c2 100644 --- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h @@ -77,18 +77,18 @@ namespace WebKit { virtual void setResizable(bool); virtual void addMessageToConsole(WebCore::MessageSource source, WebCore::MessageType type, - WebCore::MessageLevel level, const WebCore::String& message, - unsigned int lineNumber, const WebCore::String& sourceID); + WebCore::MessageLevel level, const WTF::String& message, + unsigned int lineNumber, const WTF::String& sourceID); virtual bool canRunBeforeUnloadConfirmPanel(); - virtual bool runBeforeUnloadConfirmPanel(const WebCore::String& message, WebCore::Frame* frame); + virtual bool runBeforeUnloadConfirmPanel(const WTF::String& message, WebCore::Frame* frame); virtual void closeWindowSoon(); - virtual void runJavaScriptAlert(WebCore::Frame*, const WebCore::String&); - virtual bool runJavaScriptConfirm(WebCore::Frame*, const WebCore::String&); - virtual bool runJavaScriptPrompt(WebCore::Frame*, const WebCore::String& message, const WebCore::String& defaultValue, WebCore::String& result); - virtual void setStatusbarText(const WebCore::String&); + virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&); + virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&); + virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result); + virtual void setStatusbarText(const WTF::String&); virtual bool shouldInterruptJavaScript(); virtual bool tabsToLinks() const; @@ -107,18 +107,18 @@ namespace WebKit { virtual void scrollbarsModeDidChange() const; virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags); - virtual void setToolTip(const WebCore::String&, WebCore::TextDirection); + virtual void setToolTip(const WTF::String&, WebCore::TextDirection); virtual void print(WebCore::Frame*); #if ENABLE(DATABASE) - virtual void exceededDatabaseQuota(WebCore::Frame*, const WebCore::String&); + virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&); #endif #if ENABLE(OFFLINE_WEB_APPLICATIONS) virtual void reachedMaxAppCacheSize(int64_t spaceNeeded); virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*); #endif virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>); - virtual void chooseIconForFiles(const Vector<WebCore::String>&, WebCore::FileChooser*); + virtual void chooseIconForFiles(const Vector<WTF::String>&, WebCore::FileChooser*); virtual void formStateDidChange(const WebCore::Node*) { } diff --git a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h index d320c0e..07a022c 100644 --- a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h @@ -50,7 +50,7 @@ namespace WebKit { virtual void copyImageToClipboard(const WebCore::HitTestResult&); virtual void searchWithGoogle(const WebCore::Frame*); virtual void lookUpInDictionary(WebCore::Frame*); - virtual void speak(const WebCore::String&); + virtual void speak(const WTF::String&); virtual void stopSpeaking(); virtual bool isSpeaking(); diff --git a/WebKit/gtk/WebCoreSupport/DragClientGtk.h b/WebKit/gtk/WebCoreSupport/DragClientGtk.h index 6604940..514852e 100644 --- a/WebKit/gtk/WebCoreSupport/DragClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/DragClientGtk.h @@ -47,7 +47,7 @@ namespace WebKit { virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint); virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false); - virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WebCore::String& label, WebCore::Frame*); + virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*); virtual void dragControllerDestroyed(); diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h index 93f56ce..2688629 100644 --- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h @@ -86,7 +86,7 @@ namespace WebKit { virtual bool shouldBeginEditing(WebCore::Range*); virtual bool shouldEndEditing(WebCore::Range*); virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction); - virtual bool shouldInsertText(const WebCore::String&, WebCore::Range*, WebCore::EditorInsertAction); + virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction); virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting); virtual bool shouldApplyStyle(WebCore::CSSStyleDeclaration*, WebCore::Range*); @@ -120,16 +120,16 @@ namespace WebKit { virtual void textWillBeDeletedInTextField(WebCore::Element*); virtual void textDidChangeInTextArea(WebCore::Element*); - virtual void ignoreWordInSpellDocument(const WebCore::String&); - virtual void learnWord(const WebCore::String&); + virtual void ignoreWordInSpellDocument(const WTF::String&); + virtual void learnWord(const WTF::String&); virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength); - virtual WebCore::String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&); + virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&); virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength); - virtual void updateSpellingUIWithGrammarString(const WebCore::String&, const WebCore::GrammarDetail&); - virtual void updateSpellingUIWithMisspelledWord(const WebCore::String&); + virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&); + virtual void updateSpellingUIWithMisspelledWord(const WTF::String&); virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); - virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses); + virtual void getGuessesForWord(const WTF::String&, WTF::Vector<WTF::String>& guesses); virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h index 2eeeb35..33e9ee5 100644 --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h @@ -81,7 +81,7 @@ namespace WebKit { virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); - virtual void dispatchDidReceiveTitle(const WebCore::String&); + virtual void dispatchDidReceiveTitle(const WTF::String&); virtual void dispatchDidChangeIcons(); virtual void dispatchDidCommitLoad(); virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&); @@ -94,8 +94,8 @@ namespace WebKit { virtual WebCore::Frame* dispatchCreatePage(); virtual void dispatchShow(); - virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WebCore::String& MIMEType, const WebCore::ResourceRequest&); - virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>, const WebCore::String& frameName); + virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WTF::String& MIMEType, const WebCore::ResourceRequest&); + virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>, const WTF::String& frameName); virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, WTF::PassRefPtr<WebCore::FormState>); virtual void cancelPolicyCheck(); @@ -112,20 +112,20 @@ namespace WebKit { virtual void postProgressEstimateChangedNotification(); virtual void postProgressFinishedNotification(); - virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WebCore::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, - const WebCore::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); + virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, + const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); virtual void didTransferChildFrameToNewDocument(); - virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WebCore::String>&, const WTF::Vector<WebCore::String>&, const WebCore::String&, bool); + virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool); virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); - virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const WTF::Vector<WebCore::String>& paramNames, const WTF::Vector<WebCore::String>& paramValues); - virtual WebCore::String overrideMediaType() const; + virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues); + virtual WTF::String overrideMediaType() const; virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*); virtual void documentElementAvailable(); virtual void didPerformFirstNavigation() const; virtual void registerForIconNotification(bool); - virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WebCore::String& mimeType); + virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType); virtual void setMainFrameDocumentReady(bool); @@ -159,9 +159,9 @@ namespace WebKit { virtual bool shouldFallBack(const WebCore::ResourceError&); virtual bool canHandleRequest(const WebCore::ResourceRequest&) const; - virtual bool canShowMIMEType(const WebCore::String&) const; - virtual bool representationExistsForURLScheme(const WebCore::String&) const; - virtual WebCore::String generatedMIMETypeForURLScheme(const WebCore::String&) const; + virtual bool canShowMIMEType(const WTF::String&) const; + virtual bool representationExistsForURLScheme(const WTF::String&) const; + virtual WTF::String generatedMIMETypeForURLScheme(const WTF::String&) const; virtual void frameLoadCompleted(); virtual void saveViewStateToItem(WebCore::HistoryItem*); @@ -171,9 +171,9 @@ namespace WebKit { virtual void prepareForDataSourceReplacement(); virtual WTF::PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&); - virtual void setTitle(const WebCore::String& title, const WebCore::KURL&); + virtual void setTitle(const WTF::String& title, const WebCore::KURL&); - virtual WebCore::String userAgent(const WebCore::KURL&); + virtual WTF::String userAgent(const WebCore::KURL&); virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*); diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp index 616834b..1256000 100644 --- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp @@ -23,6 +23,7 @@ #include "webkitwebview.h" #include "webkitwebinspector.h" #include "webkitprivate.h" +#include "webkitversion.h" #include "InspectorController.h" #include "NotImplemented.h" #include "PlatformString.h" @@ -84,8 +85,10 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller) GOwnPtr<gchar> currentDirectory(g_get_current_dir()); GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get())); inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL)); - } else - inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL)); + } else { + GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION)); + inspectorURI.set(g_filename_to_uri(dataPath.get(), NULL, NULL)); + } webkit_web_view_load_uri(inspectorWebView, inspectorURI.get()); @@ -101,14 +104,18 @@ void InspectorClient::releaseFrontendPage() m_frontendPage = 0; } -void InspectorClient::highlight(Node* node) +void InspectorClient::highlight(Node*) { - notImplemented(); + hideHighlight(); } void InspectorClient::hideHighlight() { - notImplemented(); + // FIXME: we should be able to only invalidate the actual rects of + // the new and old nodes. We need to track the nodes, and take the + // actual highlight size into account when calculating the damage + // rect. + gtk_widget_queue_draw(GTK_WIDGET(m_inspectedWebView)); } void InspectorClient::populateSetting(const String& key, String* value) @@ -198,8 +205,10 @@ String InspectorFrontendClient::localizedStringsURL() GOwnPtr<gchar> currentDirectory(g_get_current_dir()); GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get())); URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL)); - } else - URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL)); + } else { + GOwnPtr<gchar> localizedStringsPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/localizedStrings.js", WEBKITGTK_API_VERSION)); + URL.set(g_filename_to_uri(localizedStringsPath.get(), NULL, NULL)); + } // FIXME: support l10n of localizedStrings.js return String::fromUTF8(URL.get()); diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h index fc9b6d8..b72bc82 100644 --- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h @@ -33,11 +33,11 @@ #include "InspectorFrontendClientLocal.h" #include "webkitwebview.h" #include "webkitwebinspector.h" +#include <wtf/Forward.h> namespace WebCore { class Node; class Page; - class String; } namespace WebKit { @@ -58,10 +58,10 @@ namespace WebKit { virtual void highlight(WebCore::Node*); virtual void hideHighlight(); - virtual void populateSetting(const WebCore::String& key, WebCore::String* value); - virtual void storeSetting(const WebCore::String& key, const WebCore::String& value); + virtual void populateSetting(const WTF::String& key, WTF::String* value); + virtual void storeSetting(const WTF::String& key, const WTF::String& value); - virtual bool sendMessageToFrontend(const WebCore::String&); + virtual bool sendMessageToFrontend(const WTF::String&); void releaseFrontendPage(); @@ -79,9 +79,9 @@ namespace WebKit { void destroyInspectorWindow(); - virtual WebCore::String localizedStringsURL(); + virtual WTF::String localizedStringsURL(); - virtual WebCore::String hiddenPanels(); + virtual WTF::String hiddenPanels(); virtual void bringToFront(); virtual void closeWindow(); @@ -91,7 +91,7 @@ namespace WebKit { virtual void setAttachedWindowHeight(unsigned height); - virtual void inspectedURLChanged(const WebCore::String& newURL); + virtual void inspectedURLChanged(const WTF::String& newURL); private: virtual ~InspectorFrontendClient(); diff --git a/WebKit/gtk/gdom/ConvertToGCharPrivate.h b/WebKit/gtk/gdom/ConvertToGCharPrivate.h index dd8c65e..ef42b08 100644 --- a/WebKit/gtk/gdom/ConvertToGCharPrivate.h +++ b/WebKit/gtk/gdom/ConvertToGCharPrivate.h @@ -25,7 +25,7 @@ #include "PlatformString.h" #include <wtf/text/CString.h> -inline gchar* copyAsGchar(WebCore::String const& s) +inline gchar* copyAsGchar(WTF::String const& s) { return g_strdup(s.utf8().data()); } @@ -40,7 +40,7 @@ inline gchar* copyAsGchar(const JSC::UString& s) return g_strdup(s.UTF8String().c_str()); } -inline gchar* copyAsGchar(WebCore::AtomicString const& s) +inline gchar* copyAsGchar(WTF::AtomicString const& s) { return g_strdup(s.string().utf8().data()); } diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog index aac3c0c..f088275 100644 --- a/WebKit/gtk/po/ChangeLog +++ b/WebKit/gtk/po/ChangeLog @@ -1,3 +1,11 @@ +2010-08-03 Jorge González <aloriel@gmail.com> + + Reviewed by Gustavo Noronha. + + Spanish translation update. + + * es.po: Updated. + 2010-07-13 Alejandro G. Castro <alex@igalia.com> Reviewed by Gustavo Noronha. diff --git a/WebKit/gtk/po/es.po b/WebKit/gtk/po/es.po index b06ba1b..433c9de 100644 --- a/WebKit/gtk/po/es.po +++ b/WebKit/gtk/po/es.po @@ -1,21 +1,20 @@ -# translation of webkit.webkit.HEAD.es.po.po to Español +# translation of webkit.po to Español # This file is put in the public domain. +# Jorge González <jorgegonz@svn.gnome.org>, 2010. # -# Jacinto Capote Robles <fastangel@gmail.com>, 2009. -# Jorge González <jorgegonz@svn.gnome.org>, 2009. msgid "" msgstr "" -"Project-Id-Version: webkit.webkit.HEAD.es.po\n" +"Project-Id-Version: webkit\n" "Report-Msgid-Bugs-To: http://bugs.webkit.org/\n" "POT-Creation-Date: 2010-02-25 15:53-0300\n" -"PO-Revision-Date: 2009-06-11 15:36+0200\n" +"PO-Revision-Date: 2010-05-01 11:18+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535 msgid "Upload File" @@ -73,35 +72,35 @@ msgstr "_Insertar un carácter de control Unicode" #: WebKit/gtk/webkit/webkitdownload.cpp:266 msgid "Network Request" -msgstr "" +msgstr "Solicitud de red" #: WebKit/gtk/webkit/webkitdownload.cpp:267 msgid "The network request for the URI that should be downloaded" -msgstr "" +msgstr "La solicitud de red para el URI que se debe descargar" #: WebKit/gtk/webkit/webkitdownload.cpp:281 msgid "Network Response" -msgstr "" +msgstr "Respuesta de red" #: WebKit/gtk/webkit/webkitdownload.cpp:282 msgid "The network response for the URI that should be downloaded" -msgstr "" +msgstr "La respuesta de red para el URI que se debería descargar" #: WebKit/gtk/webkit/webkitdownload.cpp:296 msgid "Destination URI" -msgstr "" +msgstr "URI de destino" #: WebKit/gtk/webkit/webkitdownload.cpp:297 msgid "The destination URI where to save the file" -msgstr "" +msgstr "El URI de destino donde guardar el archivo" #: WebKit/gtk/webkit/webkitdownload.cpp:311 msgid "Suggested Filename" -msgstr "" +msgstr "Nombre de archivo sugerido" #: WebKit/gtk/webkit/webkitdownload.cpp:312 msgid "The filename suggested as default when saving" -msgstr "" +msgstr "El nombre de archivo sugerido como predeterminado al guardar" #: WebKit/gtk/webkit/webkitdownload.cpp:329 msgid "Progress" @@ -109,7 +108,7 @@ msgstr "Progreso" #: WebKit/gtk/webkit/webkitdownload.cpp:330 msgid "Determines the current progress of the download" -msgstr "" +msgstr "Determina el progreso actual de la descarga" #: WebKit/gtk/webkit/webkitdownload.cpp:343 msgid "Status" @@ -125,7 +124,7 @@ msgstr "Tamaño actual" #: WebKit/gtk/webkit/webkitdownload.cpp:360 msgid "The length of the data already downloaded" -msgstr "" +msgstr "El tamaño de los datos ya descargados" #: WebKit/gtk/webkit/webkitdownload.cpp:374 msgid "Total Size" @@ -133,20 +132,20 @@ msgstr "Tamaño total" #: WebKit/gtk/webkit/webkitdownload.cpp:375 msgid "The total size of the file" -msgstr "" +msgstr "El tamaño total del archivo" #: WebKit/gtk/webkit/webkitdownload.cpp:526 msgid "User cancelled the download" -msgstr "" +msgstr "El usuario canceló la descarga" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:248 #, c-format msgid "A username and password are being requested by the site %s" -msgstr "" +msgstr "El sitio %s está solicitando un usuario y una contraseña" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:278 msgid "Server message:" -msgstr "" +msgstr "Mensaje del servidor:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:291 msgid "Username:" @@ -157,9 +156,8 @@ msgid "Password:" msgstr "Contraseña:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:302 -#, fuzzy msgid "_Remember password" -msgstr "Recordar contraseña" +msgstr "_Recordar contraseña" #: WebKit/gtk/webkit/webkitwebframe.cpp:298 msgid "Name" @@ -167,7 +165,7 @@ msgstr "Nombre" #: WebKit/gtk/webkit/webkitwebframe.cpp:299 msgid "The name of the frame" -msgstr "" +msgstr "El nombre del marco" #: WebKit/gtk/webkit/webkitwebframe.cpp:305 #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146 @@ -177,7 +175,7 @@ msgstr "Título" #: WebKit/gtk/webkit/webkitwebframe.cpp:306 msgid "The document title of the frame" -msgstr "" +msgstr "El nombre de documento del marco" #: WebKit/gtk/webkit/webkitwebframe.cpp:312 #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178 @@ -187,29 +185,32 @@ msgstr "URI" #: WebKit/gtk/webkit/webkitwebframe.cpp:313 msgid "The current URI of the contents displayed by the frame" -msgstr "" +msgstr "El URI actual del contenido mostrado en el marco" #: WebKit/gtk/webkit/webkitwebframe.cpp:344 msgid "Horizontal Scrollbar Policy" -msgstr "" +msgstr "Directiva de la barra de desplazamiento horizontal" #: WebKit/gtk/webkit/webkitwebframe.cpp:345 msgid "" "Determines the current policy for the horizontal scrollbar of the frame." msgstr "" +"Determina la política actual para la barra de desplazamiento horizontal del " +"marco." #: WebKit/gtk/webkit/webkitwebframe.cpp:362 msgid "Vertical Scrollbar Policy" -msgstr "" +msgstr "Directiva de la barra de desplazamiento vertical" #: WebKit/gtk/webkit/webkitwebframe.cpp:363 -#, fuzzy msgid "Determines the current policy for the vertical scrollbar of the frame." -msgstr "Determina el estado actual de la descarga" +msgstr "" +"Determina la política actual para la barra de desplazamiento vertical del " +"marco." #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147 msgid "The title of the history item" -msgstr "" +msgstr "El título del elemento del histórico" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162 msgid "Alternate Title" @@ -217,28 +218,28 @@ msgstr "Título alternativo" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163 msgid "The alternate title of the history item" -msgstr "" +msgstr "El título alternativo del elemento del histórico" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179 msgid "The URI of the history item" -msgstr "" +msgstr "El URI del elemento del histórico" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194 #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173 msgid "Original URI" -msgstr "" +msgstr "URI original" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195 msgid "The original URI of the history item" -msgstr "" +msgstr "El URI original del elemento del histórico" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210 msgid "Last visited Time" -msgstr "" +msgstr "Hora de la última visita" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211 msgid "The time at which the history item was last visited" -msgstr "" +msgstr "La hora en la que se vió el elemento del histórico por última vez" #: WebKit/gtk/webkit/webkitwebinspector.cpp:268 msgid "Web View" @@ -246,23 +247,23 @@ msgstr "Vista web" #: WebKit/gtk/webkit/webkitwebinspector.cpp:269 msgid "The Web View that renders the Web Inspector itself" -msgstr "" +msgstr "La vista de web que renderiza el inspector web en sí" #: WebKit/gtk/webkit/webkitwebinspector.cpp:282 msgid "Inspected URI" -msgstr "" +msgstr "URI inspeccionada" #: WebKit/gtk/webkit/webkitwebinspector.cpp:283 msgid "The URI that is currently being inspected" -msgstr "" +msgstr "El URI que actualmente está siendo inspeccionado" #: WebKit/gtk/webkit/webkitwebinspector.cpp:299 msgid "Enable JavaScript profiling" -msgstr "" +msgstr "Activar perfilado de JavaScript" #: WebKit/gtk/webkit/webkitwebinspector.cpp:300 msgid "Profile the executed JavaScript." -msgstr "" +msgstr "Perfilar el JavaScript ejecutado." #: WebKit/gtk/webkit/webkitwebinspector.cpp:315 msgid "Enable Timeline profiling" @@ -278,11 +279,11 @@ msgstr "Razón" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159 msgid "The reason why this navigation is occurring" -msgstr "" +msgstr "La razón por la cuál está ocurriendo esta navegación" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174 msgid "The URI that was requested as the target for the navigation" -msgstr "" +msgstr "El URI solicitado como el objetivo para la navegación" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188 msgid "Button" @@ -290,23 +291,24 @@ msgstr "Botón" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189 msgid "The button used to click" -msgstr "" +msgstr "El botón usado para pulsar" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204 msgid "Modifier state" -msgstr "" +msgstr "Estado del modificador" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205 msgid "A bitmask representing the state of the modifier keys" msgstr "" +"Una máscara de bits que representa el estado de las teclas modificadoras" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220 msgid "Target frame" -msgstr "" +msgstr "Marco de destino" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221 msgid "The target frame for the navigation" -msgstr "" +msgstr "El marco de destino para la navegación" #: WebKit/gtk/webkit/webkitwebsettings.cpp:237 msgid "Default Encoding" @@ -314,55 +316,59 @@ msgstr "Codificación predeterminada" #: WebKit/gtk/webkit/webkitwebsettings.cpp:238 msgid "The default encoding used to display text." -msgstr "" +msgstr "La codificación predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:246 msgid "Cursive Font Family" -msgstr "" +msgstr "Tipografía cursiva" #: WebKit/gtk/webkit/webkitwebsettings.cpp:247 msgid "The default Cursive font family used to display text." msgstr "" +"La familia tipográfica cursiva predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:255 msgid "Default Font Family" -msgstr "" +msgstr "Tipografía predeterminada" #: WebKit/gtk/webkit/webkitwebsettings.cpp:256 msgid "The default font family used to display text." -msgstr "" +msgstr "La familia tipográfica predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:264 msgid "Fantasy Font Family" -msgstr "" +msgstr "Familia de tipografía fantasía" #: WebKit/gtk/webkit/webkitwebsettings.cpp:265 msgid "The default Fantasy font family used to display text." msgstr "" +"La familia tipográfica fantasía predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:273 msgid "Monospace Font Family" -msgstr "" +msgstr "Tipografía Monospace" #: WebKit/gtk/webkit/webkitwebsettings.cpp:274 msgid "The default font family used to display monospace text." msgstr "" +"La familia tipográfica predeterminada usada para mostrar texto monoespaciado." #: WebKit/gtk/webkit/webkitwebsettings.cpp:282 msgid "Sans Serif Font Family" -msgstr "" +msgstr "Tipografía Sans Serif" #: WebKit/gtk/webkit/webkitwebsettings.cpp:283 msgid "The default Sans Serif font family used to display text." msgstr "" +"La familia tipográfica Sans Serif predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:291 msgid "Serif Font Family" -msgstr "" +msgstr "Tipografía Serif" #: WebKit/gtk/webkit/webkitwebsettings.cpp:292 msgid "The default Serif font family used to display text." -msgstr "" +msgstr "La familia tipográfica Serif predeterminada usada para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:300 msgid "Default Font Size" @@ -370,15 +376,17 @@ msgstr "Tamaño de predeterminado de tipografía" #: WebKit/gtk/webkit/webkitwebsettings.cpp:301 msgid "The default font size used to display text." -msgstr "" +msgstr "El tamaño de tipografía predeterminado usado para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:309 msgid "Default Monospace Font Size" -msgstr "" +msgstr "Tipografía predeterminada Monospace" #: WebKit/gtk/webkit/webkitwebsettings.cpp:310 msgid "The default font size used to display monospace text." msgstr "" +"El tamaño de tipografía predeterminado usado para mostrar texto " +"monoespaciado." #: WebKit/gtk/webkit/webkitwebsettings.cpp:318 msgid "Minimum Font Size" @@ -386,55 +394,55 @@ msgstr "Tamaño mínimo de tipografía" #: WebKit/gtk/webkit/webkitwebsettings.cpp:319 msgid "The minimum font size used to display text." -msgstr "" +msgstr "El mínimo tamaño de tipografía usado para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:327 msgid "Minimum Logical Font Size" -msgstr "" +msgstr "Tamaño mínimo lógico de tipografía" #: WebKit/gtk/webkit/webkitwebsettings.cpp:328 msgid "The minimum logical font size used to display text." -msgstr "" +msgstr "El tamaño mínimo lógico de tipografía usado para mostrar texto." #: WebKit/gtk/webkit/webkitwebsettings.cpp:347 msgid "Enforce 96 DPI" -msgstr "" +msgstr "Forzar 96 DPI" #: WebKit/gtk/webkit/webkitwebsettings.cpp:348 msgid "Enforce a resolution of 96 DPI" -msgstr "" +msgstr "Forzar una resolución de 96 DPI" #: WebKit/gtk/webkit/webkitwebsettings.cpp:356 msgid "Auto Load Images" -msgstr "" +msgstr "Cargar imágenes automáticamente" #: WebKit/gtk/webkit/webkitwebsettings.cpp:357 msgid "Load images automatically." -msgstr "" +msgstr "Cargar imágenes automáticamente." #: WebKit/gtk/webkit/webkitwebsettings.cpp:365 msgid "Auto Shrink Images" -msgstr "" +msgstr "Autoencoger imágenes" #: WebKit/gtk/webkit/webkitwebsettings.cpp:366 msgid "Automatically shrink standalone images to fit." -msgstr "" +msgstr "Encoger imágenes independientes para ajustarlas." #: WebKit/gtk/webkit/webkitwebsettings.cpp:374 msgid "Print Backgrounds" -msgstr "" +msgstr "Imprimir fondos" #: WebKit/gtk/webkit/webkitwebsettings.cpp:375 msgid "Whether background images should be printed." -msgstr "" +msgstr "Indica si se deben imprimir las imágenes de fondo." #: WebKit/gtk/webkit/webkitwebsettings.cpp:383 msgid "Enable Scripts" -msgstr "" +msgstr "Activar scripts" #: WebKit/gtk/webkit/webkitwebsettings.cpp:384 msgid "Enable embedded scripting languages." -msgstr "" +msgstr "Activar lenguajes de scrpting empotrados" #: WebKit/gtk/webkit/webkitwebsettings.cpp:392 msgid "Enable Plugins" @@ -442,15 +450,15 @@ msgstr "Activar complementos" #: WebKit/gtk/webkit/webkitwebsettings.cpp:393 msgid "Enable embedded plugin objects." -msgstr "" +msgstr "Activar objetos de complemento empotrados." #: WebKit/gtk/webkit/webkitwebsettings.cpp:401 msgid "Resizable Text Areas" -msgstr "" +msgstr "Áreas de texto redimensionables" #: WebKit/gtk/webkit/webkitwebsettings.cpp:402 msgid "Whether text areas are resizable." -msgstr "" +msgstr "Indica si las áreas de texto son redimensionables." #: WebKit/gtk/webkit/webkitwebsettings.cpp:409 msgid "User Stylesheet URI" @@ -458,47 +466,49 @@ msgstr "URI de la hoja de estilo del usuario" #: WebKit/gtk/webkit/webkitwebsettings.cpp:410 msgid "The URI of a stylesheet that is applied to every page." -msgstr "" +msgstr "El URI de una hoja de estilo que se aplica a cada página." #: WebKit/gtk/webkit/webkitwebsettings.cpp:425 msgid "Zoom Stepping Value" -msgstr "" +msgstr "Valor del paso de la ampliación" #: WebKit/gtk/webkit/webkitwebsettings.cpp:426 msgid "The value by which the zoom level is changed when zooming in or out." msgstr "" +"El valor por el cuál el nivel de ampliación se cambia al ampliar o reducir." #: WebKit/gtk/webkit/webkitwebsettings.cpp:444 msgid "Enable Developer Extras" -msgstr "" +msgstr "Activar extras para desarrolladores" #: WebKit/gtk/webkit/webkitwebsettings.cpp:445 msgid "Enables special extensions that help developers" -msgstr "" +msgstr "Activa extensiones especiales para ayudar a los desarrolladores" #: WebKit/gtk/webkit/webkitwebsettings.cpp:465 msgid "Enable Private Browsing" -msgstr "" +msgstr "Activar navegación privada" #: WebKit/gtk/webkit/webkitwebsettings.cpp:466 msgid "Enables private browsing mode" -msgstr "" +msgstr "Activa el modo de navegación privado" #: WebKit/gtk/webkit/webkitwebsettings.cpp:481 msgid "Enable Spell Checking" -msgstr "" +msgstr "Activar revisión ortográfica" #: WebKit/gtk/webkit/webkitwebsettings.cpp:482 msgid "Enables spell checking while typing" -msgstr "" +msgstr "Activa la revisión ortográfica al escribir" #: WebKit/gtk/webkit/webkitwebsettings.cpp:505 msgid "Languages to use for spell checking" -msgstr "" +msgstr "Idiomas que usar para la revisión ortográfica" #: WebKit/gtk/webkit/webkitwebsettings.cpp:506 msgid "Comma separated list of languages to use for spell checking" msgstr "" +"Lista separada por comas de los idiomas que usar para la revisión ortográfica" #: WebKit/gtk/webkit/webkitwebsettings.cpp:520 msgid "Enable Caret Browsing" @@ -510,11 +520,11 @@ msgstr "" #: WebKit/gtk/webkit/webkitwebsettings.cpp:536 msgid "Enable HTML5 Database" -msgstr "" +msgstr "Activar la base de datos de HTML5" #: WebKit/gtk/webkit/webkitwebsettings.cpp:537 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Indica si se debe activar el soporte para la base de datos de HTML5" #: WebKit/gtk/webkit/webkitwebsettings.cpp:552 msgid "Enable HTML5 Local Storage" @@ -526,11 +536,11 @@ msgstr "" #: WebKit/gtk/webkit/webkitwebsettings.cpp:567 msgid "Enable XSS Auditor" -msgstr "" +msgstr "Activar el auditor de XSS" #: WebKit/gtk/webkit/webkitwebsettings.cpp:568 msgid "Whether to enable teh XSS auditor" -msgstr "" +msgstr "Indica si se debe activar el auditor de XSS" #: WebKit/gtk/webkit/webkitwebsettings.cpp:586 msgid "User Agent" @@ -608,15 +618,15 @@ msgstr "" #: WebKit/gtk/webkit/webkitwebsettings.cpp:763 msgid "Enable page cache" -msgstr "" +msgstr "Activar caché de páginas" #: WebKit/gtk/webkit/webkitwebsettings.cpp:764 msgid "Whether the page cache should be used" -msgstr "" +msgstr "Indica si se debería usar la caché de páginas" #: WebKit/gtk/webkit/webkitwebsettings.cpp:784 msgid "Auto Resize Window" -msgstr "" +msgstr "Autoredimensionar ventana" #: WebKit/gtk/webkit/webkitwebsettings.cpp:785 msgid "Automatically resize the toplevel window when a page requests it" @@ -624,19 +634,21 @@ msgstr "" #: WebKit/gtk/webkit/webkitwebsettings.cpp:817 msgid "Enable Java Applet" -msgstr "" +msgstr "Activar la miniaplicación de Java" #: WebKit/gtk/webkit/webkitwebsettings.cpp:818 msgid "Whether Java Applet support through <applet> should be enabled" msgstr "" +"Indica si se debería activar el soporte de miniaplicaciones Java a través de " +"<applet>" #: WebKit/gtk/webkit/webkitwebview.cpp:2319 msgid "Returns the @web_view's document title" -msgstr "" +msgstr "Devuelve el título del documento de @web_view" #: WebKit/gtk/webkit/webkitwebview.cpp:2333 msgid "Returns the current URI of the contents displayed by the @web_view" -msgstr "" +msgstr "Devuelve el contenido actual del URI mostrado en @web_view" #: WebKit/gtk/webkit/webkitwebview.cpp:2346 msgid "Copy target list" @@ -645,6 +657,8 @@ msgstr "Copiar la lista de destinos" #: WebKit/gtk/webkit/webkitwebview.cpp:2347 msgid "The list of targets this web view supports for clipboard copying" msgstr "" +"La lista de objetivos que esta vista web soporta para copiar desde el " +"portapapeles" #: WebKit/gtk/webkit/webkitwebview.cpp:2360 msgid "Paste target list" @@ -653,6 +667,8 @@ msgstr "Pegar la lista de destinos" #: WebKit/gtk/webkit/webkitwebview.cpp:2361 msgid "The list of targets this web view supports for clipboard pasting" msgstr "" +"La lista de objetivos que esta vista web soporta para pegar desde el " +"portapapeles" #: WebKit/gtk/webkit/webkitwebview.cpp:2367 msgid "Settings" @@ -660,7 +676,7 @@ msgstr "Ajustes" #: WebKit/gtk/webkit/webkitwebview.cpp:2368 msgid "An associated WebKitWebSettings instance" -msgstr "" +msgstr "Una instancia asociada de WebKitWebSettings" #: WebKit/gtk/webkit/webkitwebview.cpp:2381 msgid "Web Inspector" @@ -668,7 +684,7 @@ msgstr "Inspector web" #: WebKit/gtk/webkit/webkitwebview.cpp:2382 msgid "The associated WebKitWebInspector instance" -msgstr "" +msgstr "La instanacia aosiciada de WebKitWebInspector" #: WebKit/gtk/webkit/webkitwebview.cpp:2402 msgid "Editable" @@ -676,7 +692,7 @@ msgstr "Editable" #: WebKit/gtk/webkit/webkitwebview.cpp:2403 msgid "Whether content can be modified by the user" -msgstr "" +msgstr "Indica si el usuario puede modificar el contenido" #: WebKit/gtk/webkit/webkitwebview.cpp:2409 msgid "Transparent" @@ -684,7 +700,7 @@ msgstr "Transparente" #: WebKit/gtk/webkit/webkitwebview.cpp:2410 msgid "Whether content has a transparent background" -msgstr "" +msgstr "Indica si el contenido tiene un fondo transparente" #: WebKit/gtk/webkit/webkitwebview.cpp:2423 msgid "Zoom level" @@ -696,11 +712,11 @@ msgstr "El nivel de ampliación del contenido" #: WebKit/gtk/webkit/webkitwebview.cpp:2439 msgid "Full content zoom" -msgstr "" +msgstr "Ampliación completa del contenido" #: WebKit/gtk/webkit/webkitwebview.cpp:2440 msgid "Whether the full content is scaled when zooming" -msgstr "" +msgstr "Indica si el contenido completo se escala al ampliar" #: WebKit/gtk/webkit/webkitwebview.cpp:2453 msgid "Encoding" @@ -712,15 +728,15 @@ msgstr "La codificación predeterminada de la vista web" #: WebKit/gtk/webkit/webkitwebview.cpp:2467 msgid "Custom Encoding" -msgstr "" +msgstr "Codificación personalizada" #: WebKit/gtk/webkit/webkitwebview.cpp:2468 msgid "The custom encoding of the web view" -msgstr "" +msgstr "La codificación de caracteres personalizada de la vista de la web" #: WebKit/gtk/webkit/webkitwebview.cpp:2520 msgid "Icon URI" -msgstr "" +msgstr "Icono de URI" #: WebKit/gtk/webkit/webkitwebview.cpp:2521 msgid "The URI for the favicon for the #WebKitWebView." @@ -738,6 +754,8 @@ msgstr "Restablecer" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70 msgid "This is a searchable index. Enter search keywords: " msgstr "" +"Es un índice en el que se puede buscar. Introduzca palabras clave de " +"búsqueda:" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75 msgid "Choose File" @@ -781,7 +799,7 @@ msgstr "Re_cargar" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183 msgid "No Guesses Found" -msgstr "" +msgstr "No se encontró ninguna sugerencia" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188 msgid "_Ignore Spelling" @@ -797,7 +815,7 @@ msgstr "_Buscar en la web" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203 msgid "_Look Up in Dictionary" -msgstr "" +msgstr "_Buscar en diccionario" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208 msgid "_Open Link" @@ -817,19 +835,19 @@ msgstr "_Mostrar ortografía y gramática" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223 msgid "_Hide Spelling and Grammar" -msgstr "" +msgstr "_Ocultar ortografía y grámatica" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228 msgid "_Check Document Now" -msgstr "" +msgstr "_Comprobar documento ahora" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233 msgid "Check Spelling While _Typing" -msgstr "" +msgstr "Comprobar ortografía al _escribir" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238 msgid "Check _Grammar With Spelling" -msgstr "" +msgstr "Comprobar gra_mática y ortografía" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243 msgid "_Font" @@ -837,7 +855,7 @@ msgstr "_Tipografía" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266 msgid "_Outline" -msgstr "" +msgstr "C_ontorno" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271 msgid "Inspect _Element" @@ -865,7 +883,7 @@ msgstr "definición" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301 msgid "press" -msgstr "" +msgstr "pulsar" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306 msgid "select" @@ -897,23 +915,23 @@ msgstr "Desconocido" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364 msgid "Loading..." -msgstr "" +msgstr "Cargando…" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369 msgid "Live Broadcast" -msgstr "" +msgstr "En directo" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375 msgid "audio element controller" -msgstr "" +msgstr "controlador de elemento de sonido" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377 msgid "video element controller" -msgstr "" +msgstr "controlador de elemento de vídeo" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379 msgid "mute" -msgstr "" +msgstr "silenciar" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381 msgid "unmute" @@ -921,15 +939,15 @@ msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383 msgid "play" -msgstr "" +msgstr "play" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385 msgid "pause" -msgstr "" +msgstr "pause" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387 msgid "movie time" -msgstr "" +msgstr "tiempo de la película" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389 msgid "timeline slider thumb" @@ -937,28 +955,27 @@ msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391 msgid "back 30 seconds" -msgstr "" +msgstr "atrás 30 segundos" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393 msgid "return to realtime" -msgstr "" +msgstr "volver a tiempo real" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395 msgid "elapsed time" -msgstr "" +msgstr "tiempo transcurrido" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397 msgid "remaining time" -msgstr "" +msgstr "tiempo restante" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399 -#, fuzzy msgid "status" -msgstr "Estado" +msgstr "estado" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401 msgid "fullscreen" -msgstr "" +msgstr "pantalla completa" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403 msgid "fast forward" @@ -1026,7 +1043,7 @@ msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442 msgid "current movie status" -msgstr "" +msgstr "estado actual de la película" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444 msgid "seek quickly back" @@ -1049,9 +1066,8 @@ msgid "stop displaying closed captions" msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461 -#, fuzzy msgid "indefinite time" -msgstr "definición" +msgstr "tiempo indefinido" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491 msgid "value missing" @@ -1067,7 +1083,7 @@ msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507 msgid "too long" -msgstr "" +msgstr "demasiado largo" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512 msgid "range underflow" @@ -1080,6 +1096,3 @@ msgstr "" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522 msgid "step mismatch" msgstr "" - -#~ msgid "_Searchable Index" -#~ msgstr "Índice buscable" diff --git a/WebKit/gtk/tests/testdomdocument.c b/WebKit/gtk/tests/testdomdocument.c index 4c677ea..ec2f579 100644 --- a/WebKit/gtk/tests/testdomdocument.c +++ b/WebKit/gtk/tests/testdomdocument.c @@ -75,7 +75,7 @@ static void test_dom_document_title(DomDocumentFixture* fixture, gconstpointer d g_assert(title); g_assert_cmpstr(title, ==, "This is the title"); g_free(title); - webkit_dom_document_set_title(document, (gchar*)"This is the second title"); + webkit_dom_document_set_title(document, "This is the second title"); title = webkit_dom_document_get_title(document); g_assert(title); g_assert_cmpstr(title, ==, "This is the second title"); @@ -89,7 +89,7 @@ static void test_dom_document_get_elements_by_tag_name(DomDocumentFixture* fixtu g_assert(view); WebKitDOMDocument* document = webkit_web_view_get_dom_document(view); g_assert(document); - WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_tag_name(document, (gchar*)"li"); + WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_tag_name(document, "li"); g_assert(list); gulong length = webkit_dom_node_list_get_length(list); g_assert_cmpint(length, ==, 3); @@ -116,7 +116,7 @@ static void test_dom_document_get_elements_by_class_name(DomDocumentFixture* fix g_assert(view); WebKitDOMDocument* document = webkit_web_view_get_dom_document(view); g_assert(document); - WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_class_name(document, (gchar*)"test"); + WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_class_name(document, "test"); g_assert(list); gulong length = webkit_dom_node_list_get_length(list); g_assert_cmpint(length, ==, 2); @@ -139,17 +139,17 @@ static void test_dom_document_get_element_by_id(DomDocumentFixture* fixture, gco g_assert(view); WebKitDOMDocument* document = webkit_web_view_get_dom_document(view); g_assert(document); - WebKitDOMElement* element = webkit_dom_document_get_element_by_id(document, (gchar*)"testok"); + WebKitDOMElement* element = webkit_dom_document_get_element_by_id(document, "testok"); g_assert(element); - element = webkit_dom_document_get_element_by_id(document, (gchar*)"this-id-does-not-exist"); + element = webkit_dom_document_get_element_by_id(document, "this-id-does-not-exist"); g_assert(element == 0); /* The DOM spec says the return value is undefined when there's * more than one element with the same id; in our case the first * one will be returned */ - element = webkit_dom_document_get_element_by_id(document, (gchar*)"testbad"); + element = webkit_dom_document_get_element_by_id(document, "testbad"); g_assert(element); WebKitDOMHTMLElement* htmlElement = (WebKitDOMHTMLElement*)element; - g_assert_cmpstr(webkit_dom_html_element_get_inner_text(htmlElement), ==, (gchar*)"first"); + g_assert_cmpstr(webkit_dom_html_element_get_inner_text(htmlElement), ==, "first"); } static void test_dom_document_get_links(DomDocumentFixture* fixture, gconstpointer data) diff --git a/WebKit/gtk/tests/testdomdomwindow.c b/WebKit/gtk/tests/testdomdomwindow.c index 1796057..a52bca5 100644 --- a/WebKit/gtk/tests/testdomdomwindow.c +++ b/WebKit/gtk/tests/testdomdomwindow.c @@ -26,7 +26,7 @@ #if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0) -#define HTML_DOCUMENT "<html><head><title>This is the title</title></head><body></body></html>" +#define HTML_DOCUMENT "<html><head><title>This is the title</title></head><body><p id='test'>test</p></body></html>" typedef struct { GtkWidget* webView; @@ -108,7 +108,7 @@ static void load_event_callback(WebKitWebView* webView, GParamSpec* spec, DomDom g_signal_connect(fixture->domWindow, "click-event", G_CALLBACK(clickedCallback), fixture); g_assert(fixture->clicked == FALSE); - gtk_test_widget_click (GTK_WIDGET(fixture->webView), 1, 0); + gtk_test_widget_click(GTK_WIDGET(fixture->webView), 1, 0); } } @@ -132,12 +132,69 @@ static void test_dom_domview_signals(DomDomviewFixture* fixture, gconstpointer d gtk_widget_show_all(fixture->window); gtk_window_present(GTK_WINDOW(fixture->window)); - g_main_loop_run (fixture->loop); + g_main_loop_run(fixture->loop); g_assert(fixture->loaded); g_assert(fixture->clicked); } +static gboolean +clicked_cb(WebKitDOMEventTarget* target, WebKitDOMEvent* event, DomDomviewFixture* fixture) +{ + g_assert(fixture->clicked == FALSE); + fixture->clicked = TRUE; + finish_loading(fixture); + return FALSE; +} + +static void load_status_callback(WebKitWebView* webView, GParamSpec* spec, DomDomviewFixture* fixture) +{ + WebKitLoadStatus status = webkit_web_view_get_load_status(webView); + if (status == WEBKIT_LOAD_FINISHED) { + WebKitDOMDocument* document; + WebKitDOMDOMWindow* domWindow; + WebKitDOMElement* element; + WebKitDOMEvent* event; + glong clientX, clientY; + + document = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(fixture->webView)); + g_assert(document); + domWindow = webkit_dom_document_get_default_view(document); + g_assert(domWindow); + fixture->domWindow = domWindow; + + element = webkit_dom_document_get_element_by_id(document, "test"); + g_assert(element); + event = webkit_dom_document_create_event(document, "MouseEvent", NULL); + g_assert(event); + g_assert(WEBKIT_DOM_IS_EVENT(event)); + g_assert(WEBKIT_DOM_IS_MOUSE_EVENT(event)); + clientX = webkit_dom_element_get_client_left(element); + clientY = webkit_dom_element_get_client_top(element); + webkit_dom_mouse_event_init_mouse_event(WEBKIT_DOM_MOUSE_EVENT(event), + "click", TRUE, TRUE, + 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); + g_assert(fixture->clicked == FALSE); + webkit_dom_event_target_dispatch_event(WEBKIT_DOM_EVENT_TARGET(element), event, NULL); + } + +} + +static void test_dom_domview_dispatch_event(DomDomviewFixture* fixture, gconstpointer data) +{ + g_signal_connect(fixture->window, "map-event", G_CALLBACK(map_event_cb), fixture); + g_signal_connect(fixture->webView, "notify::load-status", G_CALLBACK(load_status_callback), fixture); + + gtk_widget_show_all(fixture->window); + gtk_window_present(GTK_WINDOW(fixture->window)); + + g_main_loop_run (fixture->loop); + g_assert(fixture->clicked); +} + int main(int argc, char** argv) { if (!g_thread_supported()) @@ -153,6 +210,12 @@ int main(int argc, char** argv) test_dom_domview_signals, dom_domview_fixture_teardown); + g_test_add("/webkit/domdomview/dispatch_event", + DomDomviewFixture, HTML_DOCUMENT, + dom_domview_fixture_setup, + test_dom_domview_dispatch_event, + dom_domview_fixture_teardown); + return g_test_run(); } diff --git a/WebKit/gtk/tests/testdomnode.c b/WebKit/gtk/tests/testdomnode.c index b253d1d..c6056d6 100644 --- a/WebKit/gtk/tests/testdomnode.c +++ b/WebKit/gtk/tests/testdomnode.c @@ -138,7 +138,7 @@ static void test_dom_node_insertion(DomNodeFixture* fixture, gconstpointer data) g_assert(webkit_dom_node_has_child_nodes(WEBKIT_DOM_NODE(body)) == FALSE); /* Insert one P element */ - p = webkit_dom_document_create_element(document, (char*)"P", NULL); + p = webkit_dom_document_create_element(document, "P", NULL); webkit_dom_node_append_child(WEBKIT_DOM_NODE(body), WEBKIT_DOM_NODE(p), NULL); /* Now it should have one, the same that we inserted */ @@ -150,7 +150,7 @@ static void test_dom_node_insertion(DomNodeFixture* fixture, gconstpointer data) g_assert(webkit_dom_node_is_same_node(WEBKIT_DOM_NODE(p), node)); /* Replace the P tag with a DIV tag */ - div = webkit_dom_document_create_element(document, (char*)"DIV", NULL); + div = webkit_dom_document_create_element(document, "DIV", NULL); webkit_dom_node_replace_child(WEBKIT_DOM_NODE(body), WEBKIT_DOM_NODE(div), WEBKIT_DOM_NODE(p), NULL); g_assert(webkit_dom_node_has_child_nodes(WEBKIT_DOM_NODE(body))); list = webkit_dom_node_get_child_nodes(WEBKIT_DOM_NODE(body)); diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h index 3ce77e6..aa19bec 100644 --- a/WebKit/gtk/webkit/webkitprivate.h +++ b/WebKit/gtk/webkit/webkitprivate.h @@ -273,6 +273,12 @@ extern "C" { void webkit_web_view_set_tooltip_text(WebKitWebView*, const char*); + WEBKIT_API void + webkit_web_view_execute_core_command_by_name(WebKitWebView* webView, const gchar* name, const gchar* value); + + WEBKIT_API gboolean + webkit_web_view_is_command_enabled(WebKitWebView* webView, const gchar* name); + WebKitDownload* webkit_download_new_with_handle(WebKitNetworkRequest* request, WebCore::ResourceHandle* handle, const WebCore::ResourceResponse& response); diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp index 0ab0a9c..de074ae 100644 --- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp +++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp @@ -233,7 +233,7 @@ G_CONST_RETURN gchar* webkit_security_origin_get_protocol(WebKitSecurityOrigin* g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), NULL); WebKitSecurityOriginPrivate* priv = securityOrigin->priv; - WebCore::String protocol = priv->coreOrigin->protocol(); + WTF::String protocol = priv->coreOrigin->protocol(); if (!priv->protocol) priv->protocol = g_strdup(protocol.utf8().data()); @@ -256,7 +256,7 @@ G_CONST_RETURN gchar* webkit_security_origin_get_host(WebKitSecurityOrigin* secu g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), NULL); WebKitSecurityOriginPrivate* priv = securityOrigin->priv; - WebCore::String host = priv->coreOrigin->host(); + WTF::String host = priv->coreOrigin->host(); if (!priv->host) priv->host = g_strdup(host.utf8().data()); @@ -364,7 +364,7 @@ GList* webkit_security_origin_get_all_web_databases(WebKitSecurityOrigin* securi #if ENABLE(DATABASE) WebCore::SecurityOrigin* coreOrigin = core(securityOrigin); - Vector<WebCore::String> databaseNames; + Vector<WTF::String> databaseNames; if (!WebCore::DatabaseTracker::tracker().databaseNamesForOrigin(coreOrigin, databaseNames)) return NULL; diff --git a/WebKit/gtk/webkit/webkitversion.h.in b/WebKit/gtk/webkit/webkitversion.h.in index 5eb9426..ce6b569 100644 --- a/WebKit/gtk/webkit/webkitversion.h.in +++ b/WebKit/gtk/webkit/webkitversion.h.in @@ -30,6 +30,7 @@ G_BEGIN_DECLS #define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@) #define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@) #define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@) +#define WEBKITGTK_API_VERSION (@WEBKITGTK_API_VERSION@) #define WEBKIT_CHECK_VERSION(major, minor, micro) \ (WEBKIT_MAJOR_VERSION > (major) || \ diff --git a/WebKit/gtk/webkit/webkitwebdatabase.cpp b/WebKit/gtk/webkit/webkitwebdatabase.cpp index e92c400..d4f6198 100644 --- a/WebKit/gtk/webkit/webkitwebdatabase.cpp +++ b/WebKit/gtk/webkit/webkitwebdatabase.cpp @@ -331,7 +331,7 @@ G_CONST_RETURN gchar* webkit_web_database_get_display_name(WebKitWebDatabase* we #if ENABLE(DATABASE) WebKitWebDatabasePrivate* priv = webDatabase->priv; WebCore::DatabaseDetails details = WebCore::DatabaseTracker::tracker().detailsForNameAndOrigin(priv->name, core(priv->origin)); - WebCore::String displayName = details.displayName(); + WTF::String displayName = details.displayName(); if (displayName.isEmpty()) return ""; @@ -408,8 +408,8 @@ G_CONST_RETURN gchar* webkit_web_database_get_filename(WebKitWebDatabase* webDat #if ENABLE(DATABASE) WebKitWebDatabasePrivate* priv = webDatabase->priv; - WebCore::String coreName = WebCore::String::fromUTF8(priv->name); - WebCore::String corePath = WebCore::DatabaseTracker::tracker().fullPathForDatabase(core(priv->origin), coreName); + WTF::String coreName = WTF::String::fromUTF8(priv->name); + WTF::String corePath = WebCore::DatabaseTracker::tracker().fullPathForDatabase(core(priv->origin), coreName); if (corePath.isEmpty()) return""; @@ -470,7 +470,7 @@ void webkit_remove_all_web_databases() G_CONST_RETURN gchar* webkit_get_web_database_directory_path() { #if ENABLE(DATABASE) - WebCore::String path = WebCore::DatabaseTracker::tracker().databaseDirectoryPath(); + WTF::String path = WebCore::DatabaseTracker::tracker().databaseDirectoryPath(); if (path.isEmpty()) return ""; @@ -495,7 +495,7 @@ G_CONST_RETURN gchar* webkit_get_web_database_directory_path() void webkit_set_web_database_directory_path(const gchar* path) { #if ENABLE(DATABASE) - WebCore::String corePath = WebCore::String::fromUTF8(path); + WTF::String corePath = WTF::String::fromUTF8(path); WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(corePath); g_free(webkit_database_directory_path); diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp index 5177c4c..8a9153c 100644 --- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp +++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp @@ -301,7 +301,7 @@ WebKitWebHistoryItem* webkit_web_history_item_new_with_data(const gchar* uri, co WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; WebCore::KURL historyUri(WebCore::KURL(), uri); - WebCore::String historyTitle = WebCore::String::fromUTF8(title); + WTF::String historyTitle = WTF::String::fromUTF8(title); RefPtr<WebCore::HistoryItem> item = WebCore::HistoryItem::create(historyUri, historyTitle, 0); priv->historyItem = item.release().releaseRef(); webkit_history_item_add(webHistoryItem, priv->historyItem); @@ -365,7 +365,7 @@ void webkit_web_history_item_set_alternate_title(WebKitWebHistoryItem* webHistor WebCore::HistoryItem* item = core(webHistoryItem); - item->setAlternateTitle(WebCore::String::fromUTF8(title)); + item->setAlternateTitle(WTF::String::fromUTF8(title)); g_object_notify(G_OBJECT(webHistoryItem), "alternate-title"); } diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp index d61f3ff..71a338c 100644 --- a/WebKit/gtk/webkit/webkitwebsettings.cpp +++ b/WebKit/gtk/webkit/webkitwebsettings.cpp @@ -569,7 +569,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) PROP_ENABLE_XSS_AUDITOR, g_param_spec_boolean("enable-xss-auditor", _("Enable XSS Auditor"), - _("Whether to enable teh XSS auditor"), + _("Whether to enable the XSS auditor"), TRUE, flags)); /** diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp index 8747d42..58d91ea 100644 --- a/WebKit/gtk/webkit/webkitwebview.cpp +++ b/WebKit/gtk/webkit/webkitwebview.cpp @@ -549,6 +549,11 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* ctx.restore(); } } + + ctx.save(); + ctx.clip(static_cast<IntRect>(event->area)); + frame->page()->inspectorController()->drawNodeHighlight(ctx); + ctx.restore(); } return FALSE; @@ -792,7 +797,8 @@ static gboolean webkit_web_view_focus_in_event(GtkWidget* widget, GdkEventFocus* else focusController->setFocusedFrame(core(webView)->mainFrame()); - gtk_im_context_focus_in(webView->priv->imContext); + if (focusController->focusedFrame()->editor()->canEdit()) + gtk_im_context_focus_in(webView->priv->imContext); } return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->focus_in_event(widget, event); } @@ -4658,3 +4664,20 @@ WebKitCacheModel webkit_get_cache_model() webkit_init(); return cacheModel; } + +void webkit_web_view_execute_core_command_by_name(WebKitWebView* webView, const gchar* name, const gchar* value) +{ + g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); + g_return_if_fail(name); + g_return_if_fail(value); + + core(webView)->focusController()->focusedOrMainFrame()->editor()->command(name).execute(value); +} + +gboolean webkit_web_view_is_command_enabled(WebKitWebView* webView, const gchar* name) +{ + g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE); + g_return_val_if_fail(name, FALSE); + + return core(webView)->focusController()->focusedOrMainFrame()->editor()->command(name).isEnabled(); +} |