[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 18:01:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6152777cff987ce98c2b676a41449cb609fb0e32
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 01:21:40 2010 +0000
2010-12-04 Antonio Gomes <agomes at rim.com>
Reviewed by Martin Robinson.
[Gtk] Populate DumpRenderTreeSupportGtk (Part II)
https://bugs.webkit.org/show_bug.cgi?id=48429
Moved more private method declared with WEBKIT_API to
DumpRenderTreeSupportGtk, since they were only being used by DRT.
WebKit:
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::executeCoreCommandByName):
(DumpRenderTreeSupportGtk::isCommandEnabled):
(DumpRenderTreeSupportGtk::whiteListAccessFromOrigin):
(DumpRenderTreeSupportGtk::resetOriginAccessWhiteLists):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
* webkit/webkitprivate.cpp:
* webkit/webkitprivate.h:
* webkit/webkitwebview.cpp:
WebKitTools:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::addOriginAccessWhitelistEntry):
(LayoutTestController::execCommand):
(LayoutTestController::isCommandEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73348 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index cb2a0b1..ae0062a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-04 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (Part II)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ Moved more private method declared with WEBKIT_API to
+ DumpRenderTreeSupportGtk, since they were only being used by DRT.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::executeCoreCommandByName):
+ (DumpRenderTreeSupportGtk::isCommandEnabled):
+ (DumpRenderTreeSupportGtk::whiteListAccessFromOrigin):
+ (DumpRenderTreeSupportGtk::resetOriginAccessWhiteLists):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ * webkit/webkitprivate.cpp:
+ * webkit/webkitprivate.h:
+ * webkit/webkitwebview.cpp:
+
2010-11-08 Antonio Gomes <agomes at rim.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index 863ceb9..10694d0 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -24,6 +24,7 @@
#include "APICast.h"
#include "AXObjectCache.h"
#include "Document.h"
+#include "FocusController.h"
#include "FrameLoaderClientGtk.h"
#include "FrameView.h"
#include "FrameTree.h"
@@ -39,6 +40,7 @@
#include "RenderListItem.h"
#include "RenderView.h"
#include "RenderTreeAsText.h"
+#include "SecurityOrigin.h"
#if ENABLE(SVG)
#include "SVGSMILElement.h"
#endif
@@ -348,3 +350,30 @@ AtkObject* DumpRenderTreeSupportGtk::getFocusedAccessibleElement(WebKitWebFrame*
#endif
}
+void DumpRenderTreeSupportGtk::executeCoreCommandByName(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);
+}
+
+bool DumpRenderTreeSupportGtk::isCommandEnabled(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();
+}
+
+void DumpRenderTreeSupportGtk::whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains)
+{
+ SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
+}
+
+void DumpRenderTreeSupportGtk::resetOriginAccessWhiteLists()
+{
+ SecurityOrigin::resetOriginAccessWhitelists();
+}
+
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index 2a4994d..ef57b14 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -59,6 +59,13 @@ public:
static void clearMainFrameName(WebKitWebFrame* frame);
static AtkObject* getFocusedAccessibleElement(WebKitWebFrame* frame);
+ // WebKitWebView
+ static void executeCoreCommandByName(WebKitWebView* webView, const gchar* name, const gchar* value);
+ static bool isCommandEnabled(WebKitWebView* webView, const gchar* name);
+
+ static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
+ static void resetOriginAccessWhiteLists();
+
private:
static bool s_drtRun;
static bool s_linksIncludedInTabChain;
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 4ec6362..212f333 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -43,7 +43,6 @@
#include "ResourceHandleClient.h"
#include "ResourceHandleInternal.h"
#include "ResourceResponse.h"
-#include "SecurityOrigin.h"
#include "TextEncodingRegistry.h"
#include "WebKitDOMBinding.h"
#include "webkitnetworkresponse.h"
@@ -323,17 +322,6 @@ void webkit_init()
soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
}
-void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains)
-{
- SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
-}
-
-void webkit_reset_origin_access_white_lists()
-{
- SecurityOrigin::resetOriginAccessWhitelists();
-}
-
-
void webkitWebViewEnterFullscreen(WebKitWebView* webView, Node* node)
{
if (!node->hasTagName(HTMLNames::videoTag))
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index c7e71e6..0b59746 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -301,12 +301,6 @@ extern "C" {
GtkMenu*
webkit_web_view_get_context_menu(WebKitWebView*);
- 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);
@@ -368,12 +362,6 @@ extern "C" {
WEBKIT_API unsigned int
webkit_worker_thread_count();
- WEBKIT_API void
- webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
-
- WEBKIT_API void
- webkit_reset_origin_access_white_lists();
-
// WebKitWebDataSource private
WebKitWebDataSource*
webkit_web_data_source_new_with_loader(PassRefPtr<WebKit::DocumentLoader>);
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 90be935..9e7f3c1 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -5027,23 +5027,6 @@ WebKitCacheModel webkit_get_cache_model()
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();
-}
-
GtkMenu* webkit_web_view_get_context_menu(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 715590d..fb9b267 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,22 @@
2010-12-04 Antonio Gomes <agomes at rim.com>
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (Part II)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ Moved more private method declared with WEBKIT_API to
+ DumpRenderTreeSupportGtk, since they were only being used by DRT.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::addOriginAccessWhitelistEntry):
+ (LayoutTestController::execCommand):
+ (LayoutTestController::isCommandEnabled):
+
+2010-12-04 Antonio Gomes <agomes at rim.com>
+
Reviewed by Andreas Kling.
Removed extern webkit_web_view_set_group_name from gtk/DumpRenderTree.cpp
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 62bb2d1..8dfbecd 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -65,7 +65,6 @@ extern gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
extern GList* webkit_web_history_item_get_children(WebKitWebHistoryItem*);
extern void webkit_web_settings_add_extra_plugin_directory(WebKitWebView* view, const gchar* directory);
extern gchar* webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame);
-extern void webkit_reset_origin_access_white_lists();
}
volatile bool done;
@@ -421,7 +420,7 @@ static void resetDefaultsToConsistentValues()
webkit_web_view_set_zoom_level(webView, 1.0);
- webkit_reset_origin_access_white_lists();
+ DumpRenderTreeSupportGtk::resetOriginAccessWhiteLists();
WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list(webView);
webkit_web_back_forward_list_clear(list);
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 7d61c60..83874f4 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -51,10 +51,7 @@
extern "C" {
void webkit_application_cache_set_maximum_size(unsigned long long size);
unsigned int webkit_worker_thread_count(void);
-void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
void webkit_web_inspector_execute_script(WebKitWebInspector* inspector, long callId, const gchar* script);
-void webkit_web_view_execute_core_command_by_name(WebKitWebView* webView, const gchar* name, const gchar* value);
-gboolean webkit_web_view_is_command_enabled(WebKitWebView* webView, const gchar* name);
}
LayoutTestController::~LayoutTestController()
@@ -279,7 +276,7 @@ void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigi
gchar* sourceOriginGChar = JSStringCopyUTF8CString(sourceOrigin);
gchar* protocolGChar = JSStringCopyUTF8CString(protocol);
gchar* hostGChar = JSStringCopyUTF8CString(host);
- webkit_white_list_access_from_origin(sourceOriginGChar, protocolGChar, hostGChar, includeSubdomains);
+ DumpRenderTreeSupportGtk::whiteListAccessFromOrigin(sourceOriginGChar, protocolGChar, hostGChar, includeSubdomains);
g_free(sourceOriginGChar);
g_free(protocolGChar);
g_free(hostGChar);
@@ -545,7 +542,7 @@ void LayoutTestController::execCommand(JSStringRef name, JSStringRef value)
gchar* cName = JSStringCopyUTF8CString(name);
gchar* cValue = JSStringCopyUTF8CString(value);
- webkit_web_view_execute_core_command_by_name(view, cName, cValue);
+ DumpRenderTreeSupportGtk::executeCoreCommandByName(view, cName, cValue);
g_free(cName);
g_free(cValue);
}
@@ -562,7 +559,7 @@ bool LayoutTestController::isCommandEnabled(JSStringRef name)
ASSERT(view);
gchar* cName = JSStringCopyUTF8CString(name);
- gboolean result = webkit_web_view_is_command_enabled(view, cName);
+ bool result = DumpRenderTreeSupportGtk::isCommandEnabled(view, cName);
g_free(cName);
return result;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list