summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_main.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 00:15:20 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 00:15:20 +0000
commitc62ce3e9f74a7b55b2d50c227555a3c198fd9cf3 (patch)
tree53fc0d34109ac909a7ba8f603835da8468abcd10 /webkit/tools/test_shell/test_shell_main.cc
parentbb095ea448d990cf3ab9ae3af4c9fc11d6348f90 (diff)
downloadchromium_src-c62ce3e9f74a7b55b2d50c227555a3c198fd9cf3.zip
chromium_src-c62ce3e9f74a7b55b2d50c227555a3c198fd9cf3.tar.gz
chromium_src-c62ce3e9f74a7b55b2d50c227555a3c198fd9cf3.tar.bz2
Chromium changes to use new WebKit, WebKitClient, and WebClipboard interfaces.
A new WebKitClientImpl class is added to webkit/glue that consumers can use to help implement WebKitClient. In the future, consumers will likely subclass WebKitClientImpl. For now, that is not necessary. Since a WebImage may not hold a SkBitmap, I needed to modify ScopedClipboardWriterGlue to not deal in SkBitmaps. So, I just added a WriteBitmapFromPixels method in place of the WriteBitmap method. That method is actually named the same as the one from the base class, which is perhaps kind of nice since the purpose of ScopedClipboardWriterGlue is to override the default way of sending an image to the clipboard! R=dglazkov Review URL: http://codereview.chromium.org/28119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_main.cc')
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 9604dc7..795b17b 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -25,6 +25,7 @@
#include "net/http/http_cache.h"
#include "net/base/ssl_test_util.h"
#include "net/url_request/url_request_context.h"
+#include "webkit/glue/webkit_client_impl.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/window_open_disposition.h"
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
@@ -33,6 +34,8 @@
#include "webkit/tools/test_shell/test_shell_request_context.h"
#include "webkit/tools/test_shell/test_shell_switches.h"
+#include "WebKit.h"
+
#include <iostream>
using namespace std;
@@ -85,6 +88,9 @@ int main(int argc, char* argv[]) {
layout_test_mode,
enable_gp_fault_error_box);
+ webkit_glue::WebKitClientImpl webkit_client_impl;
+ WebKit::initialize(&webkit_client_impl);
+
// Set this early before we start using WebCore.
webkit_glue::SetLayoutTestMode(layout_test_mode);