[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
weinig at apple.com
weinig at apple.com
Wed Dec 22 18:33:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b289f7f7c85be31dfda69a0b9c3095fdf0d84851
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 23:23:19 2010 +0000
Remove associated page concept from WKView constructor
https://bugs.webkit.org/show_bug.cgi?id=50983
Reviewed by Anders Carlsson.
Step 1: Remove associate page constructors from WKView and make
all views use the shared namespace for the context.
WebKit2:
* UIProcess/API/C/win/WKView.cpp:
* UIProcess/API/C/win/WKView.h:
* UIProcess/API/mac/WKView.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:contextRef:pageGroupRef:]):
* UIProcess/API/qt/qwkcontext.cpp:
* UIProcess/API/qt/qwkcontext.h:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/win/WebView.cpp:
(WebKit::WebView::WebView):
* UIProcess/win/WebView.h:
(WebKit::WebView::create):
WebKitTools:
* TestWebKitAPI/PlatformWebView.h:
* TestWebKitAPI/mac/PlatformWebViewMac.mm:
* TestWebKitAPI/win/PlatformWebViewWin.cpp:
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/TestController.cpp:
(WTR::createOtherPage):
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
* WebKitTestRunner/win/PlatformWebViewWin.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73976 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b902f3c..d18cc84 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,27 @@
+2010-12-13 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Remove associated page concept from WKView constructor
+ https://bugs.webkit.org/show_bug.cgi?id=50983
+
+ Step 1: Remove associate page constructors from WKView and make
+ all views use the shared namespace for the context.
+
+ * UIProcess/API/C/win/WKView.cpp:
+ * UIProcess/API/C/win/WKView.h:
+ * UIProcess/API/mac/WKView.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:contextRef:pageGroupRef:]):
+ * UIProcess/API/qt/qwkcontext.cpp:
+ * UIProcess/API/qt/qwkcontext.h:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::WebView):
+ * UIProcess/win/WebView.h:
+ (WebKit::WebView::create):
+
2010-12-13 Anders Carlsson <andersca at apple.com>
Fix build.
diff --git a/WebKit2/UIProcess/API/C/win/WKView.cpp b/WebKit2/UIProcess/API/C/win/WKView.cpp
index 1cb9ae6..290b755 100644
--- a/WebKit2/UIProcess/API/C/win/WKView.cpp
+++ b/WebKit2/UIProcess/API/C/win/WKView.cpp
@@ -41,18 +41,6 @@ WKViewRef WKViewCreate(RECT rect, WKContextRef contextRef, WKPageGroupRef pageGr
return toAPI(view.release().releaseRef());
}
-WKViewRef WKViewCreateUsingSharedProcess(RECT rect, WKContextRef contextRef, WKPageGroupRef pageGroupRef, HWND parentWindow)
-{
- RefPtr<WebView> view = WebView::createUsingSharedProcess(rect, toImpl(contextRef), toImpl(pageGroupRef), parentWindow);
- return toAPI(view.release().releaseRef());
-}
-
-WKViewRef WKViewCreateForAssociatedPage(RECT rect, WKPageRef pageRef, WKPageGroupRef pageGroupRef, HWND parentWindow)
-{
- RefPtr<WebView> view = WebView::createForAssociatedPage(rect, toImpl(pageRef), toImpl(pageGroupRef), parentWindow);
- return toAPI(view.release().releaseRef());
-}
-
HWND WKViewGetWindow(WKViewRef viewRef)
{
return toImpl(viewRef)->window();
diff --git a/WebKit2/UIProcess/API/C/win/WKView.h b/WebKit2/UIProcess/API/C/win/WKView.h
index a02d98a..b9791ec 100644
--- a/WebKit2/UIProcess/API/C/win/WKView.h
+++ b/WebKit2/UIProcess/API/C/win/WKView.h
@@ -36,8 +36,6 @@ extern "C" {
WK_EXPORT WKTypeID WKViewGetTypeID();
WK_EXPORT WKViewRef WKViewCreate(RECT rect, WKContextRef context, WKPageGroupRef pageGroup, HWND parentWindow);
-WK_EXPORT WKViewRef WKViewCreateUsingSharedProcess(RECT rect, WKContextRef context, WKPageGroupRef pageGroup, HWND parentWindow);
-WK_EXPORT WKViewRef WKViewCreateForAssociatedPage(RECT rect, WKPageRef page, WKPageGroupRef pageGroup, HWND parentWindow);
WK_EXPORT HWND WKViewGetWindow(WKViewRef view);
diff --git a/WebKit2/UIProcess/API/mac/WKView.h b/WebKit2/UIProcess/API/mac/WKView.h
index dabf4dc..10f7688 100644
--- a/WebKit2/UIProcess/API/mac/WKView.h
+++ b/WebKit2/UIProcess/API/mac/WKView.h
@@ -36,12 +36,6 @@ WK_EXPORT
- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef;
- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef;
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef usingSharedProcess:(BOOL)usingSharedProcess;
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef usingSharedProcess:(BOOL)usingSharedProcess;;
-
-- (id)initWithFrame:(NSRect)frame forAssociatedPageRef:(WKPageRef)pageRef;
-- (id)initWithFrame:(NSRect)frame forAssociatedPageRef:(WKPageRef)pageRef pageGroupRef:(WKPageGroupRef)pageGroupRef;
-
@property(readonly) WKPageRef pageRef;
@property BOOL drawsBackground;
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 5d37a77..ef16f40 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -127,10 +127,6 @@ struct EditCommandState {
- (BOOL)handleMouseEvent:(NSEvent *)event;
@end
- at interface WKView ()
-- (id)initWithFrame:(NSRect)frame pageNamespace:(WebPageNamespace*)pageNamespace pageGroup:(WebPageGroup*)pageGroup;
- at end
-
@implementation WKView
- (id)initWithFrame:(NSRect)frame
@@ -145,37 +141,6 @@ struct EditCommandState {
- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef
{
- return [self initWithFrame:frame contextRef:contextRef pageGroupRef:pageGroupRef usingSharedProcess:NO];
-}
-
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef usingSharedProcess:(BOOL)usingSharedProcess
-{
- return [self initWithFrame:frame contextRef:contextRef pageGroupRef:nil usingSharedProcess:usingSharedProcess];
-}
-
-- (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef usingSharedProcess:(BOOL)usingSharedProcess
-{
- RefPtr<WebPageNamespace> pageNamespace;
- if (usingSharedProcess)
- pageNamespace = toImpl(contextRef)->sharedPageNamespace();
- else
- pageNamespace = toImpl(contextRef)->createPageNamespace();
-
- return [self initWithFrame:frame pageNamespace:pageNamespace.get() pageGroup:toImpl(pageGroupRef)];
-}
-
-- (id)initWithFrame:(NSRect)frame forAssociatedPageRef:(WKPageRef)pageRef
-{
- return [self initWithFrame:frame forAssociatedPageRef:pageRef pageGroupRef:nil];
-}
-
-- (id)initWithFrame:(NSRect)frame forAssociatedPageRef:(WKPageRef)pageRef pageGroupRef:(WKPageGroupRef)pageGroupRef
-{
- return [self initWithFrame:frame pageNamespace:toImpl(pageRef)->pageNamespace() pageGroup:toImpl(pageGroupRef)];
-}
-
-- (id)initWithFrame:(NSRect)frame pageNamespace:(WebPageNamespace*)pageNamespace pageGroup:(WebPageGroup*)pageGroup
-{
self = [super initWithFrame:frame];
if (!self)
return nil;
@@ -193,7 +158,7 @@ struct EditCommandState {
_data = [[WKViewData alloc] init];
_data->_pageClient = PageClientImpl::create(self);
- _data->_page = pageNamespace->createWebPage(pageGroup);
+ _data->_page = toImpl(contextRef)->sharedPageNamespace()->createWebPage(toImpl(pageGroupRef));
_data->_page->setPageClient(_data->_pageClient.get());
_data->_page->setDrawingArea(ChunkedUpdateDrawingAreaProxy::create(self));
_data->_page->initializeWebPage(IntSize(frame.size));
diff --git a/WebKit2/UIProcess/API/qt/qwkcontext.cpp b/WebKit2/UIProcess/API/qt/qwkcontext.cpp
index 9950f82..889464f 100644
--- a/WebKit2/UIProcess/API/qt/qwkcontext.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkcontext.cpp
@@ -61,14 +61,6 @@ QWKContext::QWKContext(WKContextRef contextRef, QObject* parent)
d->pageNamespace = d->context->sharedPageNamespace();
}
-QWKContext::QWKContext(WKPageRef pageRef, QObject* parent)
- : QObject(parent)
- , d(new QWKContextPrivate(this))
-{
- d->context = toImpl(pageRef)->context();
- d->pageNamespace = d->context->sharedPageNamespace();
-}
-
QWKContext::~QWKContext()
{
delete d;
diff --git a/WebKit2/UIProcess/API/qt/qwkcontext.h b/WebKit2/UIProcess/API/qt/qwkcontext.h
index 9aed501..384d629 100644
--- a/WebKit2/UIProcess/API/qt/qwkcontext.h
+++ b/WebKit2/UIProcess/API/qt/qwkcontext.h
@@ -23,7 +23,6 @@
#include "qwebkitglobal.h"
#include <QObject>
#include <WebKit2/WKContext.h>
-#include <WebKit2/WKPage.h>
class QWKContextPrivate;
@@ -35,7 +34,6 @@ public:
// Bridge from the C API
QWKContext(WKContextRef contextRef, QObject* parent = 0);
- QWKContext(WKPageRef pageRef, QObject* parent = 0);
private:
QWKContextPrivate* d;
diff --git a/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm b/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
index 5e64536..e129094 100644
--- a/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
+++ b/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
@@ -78,7 +78,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
ASSERT(m_page);
ASSERT(!m_inspectorView);
- m_inspectorView.adoptNS([[WKView alloc] initWithFrame:NSZeroRect forAssociatedPageRef:toAPI(page()) pageGroupRef:toAPI(inspectorPageGroup())]);
+ m_inspectorView.adoptNS([[WKView alloc] initWithFrame:NSZeroRect contextRef:toAPI(page()->context()) pageGroupRef:toAPI(inspectorPageGroup())]);
ASSERT(m_inspectorView);
return toImpl(m_inspectorView.get().pageRef);
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 3eac543..a26cfec 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -182,7 +182,7 @@ bool WebView::registerWebViewWindowClass()
return !!::RegisterClassEx(&wcex);
}
-WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND parentWindow, bool usingSharedProcess)
+WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND parentWindow)
: m_rect(rect)
, m_topLevelParentWindow(0)
, m_toolTipWindow(0)
@@ -192,26 +192,7 @@ WebView::WebView(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND p
, m_trackingMouseLeave(false)
, m_isBeingDestroyed(false)
{
- RefPtr<WebPageNamespace> pageNamespace;
- if (usingSharedProcess)
- pageNamespace = context->sharedPageNamespace();
- else
- pageNamespace = context->createPageNamespace();
-
- initialize(pageNamespace.get(), pageGroup, parentWindow);
-}
-
-WebView::WebView(RECT rect, WebPageProxy* page, WebPageGroup* pageGroup, HWND parentWindow)
- : m_rect(rect)
- , m_topLevelParentWindow(0)
- , m_toolTipWindow(0)
- , m_lastCursorSet(0)
- , m_webCoreCursor(0)
- , m_overrideCursor(0)
- , m_trackingMouseLeave(false)
- , m_isBeingDestroyed(false)
-{
- initialize(page->pageNamespace(), pageGroup, parentWindow);
+ initialize(context->sharedPageNamespace(), pageGroup, parentWindow);
}
void WebView::initialize(WebPageNamespace* pageNamespace, WebPageGroup* pageGroup, HWND parentWindow)
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index a3bf488..cd8883b 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -45,14 +45,6 @@ public:
{
return adoptRef(new WebView(rect, context, pageGroup, parentWindow, false));
}
- static PassRefPtr<WebView> createUsingSharedProcess(RECT rect, WebContext* context, WebPageGroup* pageGroup, HWND parentWindow)
- {
- return adoptRef(new WebView(rect, context, pageGroup, parentWindow, true));
- }
- static PassRefPtr<WebView> createForAssociatedPage(RECT rect, WebPageProxy* page, WebPageGroup* pageGroup, HWND parentWindow)
- {
- return adoptRef(new WebView(rect, page, pageGroup, parentWindow));
- }
~WebView();
RECT rect() const { return m_rect; }
@@ -66,8 +58,7 @@ public:
WebPageProxy* page() const { return m_page.get(); }
private:
- WebView(RECT, WebContext*, WebPageGroup*, HWND parentWindow, bool usingSharedProcess);
- WebView(RECT, WebPageProxy*, WebPageGroup*, HWND parentWindow);
+ WebView(RECT, WebContext*, WebPageGroup*, HWND parentWindow;
void initialize(WebPageNamespace*, WebPageGroup*, HWND parentWindow);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2cdc1fc..14804aa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,26 @@
Reviewed by Anders Carlsson.
+ Remove associated page concept from WKView constructor
+ https://bugs.webkit.org/show_bug.cgi?id=50983
+
+ Step 1: Remove associate page constructors from WKView and make
+ all views use the shared namespace for the context.
+
+ * TestWebKitAPI/PlatformWebView.h:
+ * TestWebKitAPI/mac/PlatformWebViewMac.mm:
+ * TestWebKitAPI/win/PlatformWebViewWin.cpp:
+ * WebKitTestRunner/PlatformWebView.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::createOtherPage):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+ * WebKitTestRunner/win/PlatformWebViewWin.cpp:
+
+2010-12-13 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
Change the WebKit2 public API so there is no explicit WKPageNamespace object
https://bugs.webkit.org/show_bug.cgi?id=50898
diff --git a/WebKitTools/TestWebKitAPI/PlatformWebView.h b/WebKitTools/TestWebKitAPI/PlatformWebView.h
index f401037..43e329b 100644
--- a/WebKitTools/TestWebKitAPI/PlatformWebView.h
+++ b/WebKitTools/TestWebKitAPI/PlatformWebView.h
@@ -52,7 +52,6 @@ class WindowMessageObserver;
class PlatformWebView {
public:
PlatformWebView(WKContextRef, WKPageGroupRef = 0);
- PlatformWebView(WKPageRef, WKPageGroupRef = 0);
~PlatformWebView();
WKPageRef page();
diff --git a/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm b/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm
index 5219f1b..c4f2d72 100644
--- a/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm
+++ b/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm
@@ -43,20 +43,6 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGro
[m_window setReleasedWhenClosed:NO];
}
-PlatformWebView::PlatformWebView(WKPageRef pageRef, WKPageGroupRef pageGroupRef)
-{
- NSRect rect = NSMakeRect(0, 0, 800, 600);
- m_view = [[WKView alloc] initWithFrame:rect forAssociatedPageRef:pageRef pageGroupRef:pageGroupRef];
-
- NSRect windowRect = NSOffsetRect(rect, -10000, [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
- m_window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
- [m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
- [[m_window contentView] addSubview:m_view];
- [m_window orderBack:nil];
- [m_window setAutodisplay:NO];
- [m_window setReleasedWhenClosed:NO];
-}
-
void PlatformWebView::resizeTo(unsigned width, unsigned height)
{
[m_view setFrame:NSMakeRect(0, 0, width, height)];
diff --git a/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp b/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp
index bfebecc..dede4b2 100644
--- a/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp
+++ b/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp
@@ -56,7 +56,6 @@ void PlatformWebView::registerWindowClass()
::RegisterClassExW(&wndClass);
}
-
PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
: m_parentWindowMessageObserver(0)
{
@@ -67,16 +66,6 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGro
m_view = WKViewCreate(viewRect, contextRef, pageGroupRef, m_window);
}
-PlatformWebView::PlatformWebView(WKPageRef pageRef, WKPageGroupRef pageGroupRef)
- : m_parentWindowMessageObserver(0)
-{
- registerWindowClass();
-
- RECT viewRect = {0, 0, 800, 600};
- m_window = CreateWindowExW(0, hostWindowClassName, L"TestWebKitAPI", WS_OVERLAPPEDWINDOW, viewRect.left, viewRect.top, viewRect.right, viewRect.bottom, 0, 0, 0, this);
- m_view = WKViewCreateForAssociatedPage(viewRect, pageRef, pageGroupRef, m_window);
-}
-
PlatformWebView::~PlatformWebView()
{
::DestroyWindow(m_window);
diff --git a/WebKitTools/WebKitTestRunner/PlatformWebView.h b/WebKitTools/WebKitTestRunner/PlatformWebView.h
index cd393f0..9739d42 100644
--- a/WebKitTools/WebKitTestRunner/PlatformWebView.h
+++ b/WebKitTools/WebKitTestRunner/PlatformWebView.h
@@ -53,7 +53,6 @@ namespace WTR {
class PlatformWebView {
public:
PlatformWebView(WKContextRef, WKPageGroupRef);
- PlatformWebView(WKPageRef, WKPageGroupRef);
~PlatformWebView();
WKPageRef page();
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index 27d16c9..8f37387 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -106,7 +106,7 @@ static void closeOtherPage(WKPageRef page, const void* clientInfo)
static WKPageRef createOtherPage(WKPageRef oldPage, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*)
{
- PlatformWebView* view = new PlatformWebView(oldPage, WKPageGetPageGroup(oldPage));
+ PlatformWebView* view = new PlatformWebView(WKPageGetContext(oldPage), WKPageGetPageGroup(oldPage));
WKPageRef newPage = view->page();
view->resizeTo(800, 600);
diff --git a/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm b/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
index 0618f99..b68f6a3 100644
--- a/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
+++ b/WebKitTools/WebKitTestRunner/mac/PlatformWebViewMac.mm
@@ -41,20 +41,6 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGro
[m_window setReleasedWhenClosed:NO];
}
-PlatformWebView::PlatformWebView(WKPageRef pageRef, WKPageGroupRef pageGroupRef)
-{
- NSRect rect = NSMakeRect(0, 0, 800, 600);
- m_view = [[WKView alloc] initWithFrame:rect forAssociatedPageRef:pageRef pageGroupRef:pageGroupRef];
-
- NSRect windowRect = NSOffsetRect(rect, -10000, [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000);
- m_window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
- [m_window setColorSpace:[[NSScreen mainScreen] colorSpace]];
- [[m_window contentView] addSubview:m_view];
- [m_window orderBack:nil];
- [m_window setAutodisplay:NO];
- [m_window setReleasedWhenClosed:NO];
-}
-
void PlatformWebView::resizeTo(unsigned width, unsigned height)
{
[m_view setFrame:NSMakeRect(0, 0, width, height)];
diff --git a/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp b/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
index 30e22b4..18e2523 100644
--- a/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
+++ b/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
@@ -34,7 +34,6 @@ namespace WTR {
class WebView : public QGraphicsView {
public:
WebView(WKContextRef);
- WebView(WKPageRef);
QGraphicsWKView* wkView() const { return m_item; }
@@ -52,14 +51,6 @@ WebView::WebView(WKContextRef contextRef)
scene()->addItem(m_item);
}
-WebView::WebView(WKPageRef pageRef)
- : QGraphicsView()
- , m_item(new QGraphicsWKView(new QWKContext(pageRef, this)))
-{
- setScene(new QGraphicsScene(this));
- scene()->addItem(m_item);
-}
-
PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef)
: m_view(new WebView(contextRef))
, m_window(new QMainWindow())
@@ -69,15 +60,6 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef)
m_window->setGeometry(0, 0, 800, 600);
}
-PlatformWebView::PlatformWebView(WKPageRef pageRef, WKPageGroupRef)
- : m_view(new WebView(pageRef))
- , m_window(new QMainWindow())
-{
- m_view->setParent(m_window);
- m_window->setCentralWidget(m_view);
- m_window->setGeometry(0, 0, 800, 600);
-}
-
PlatformWebView::~PlatformWebView()
{
delete m_window;
diff --git a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
index bbde38c..c132275 100644
--- a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
@@ -56,15 +56,6 @@ PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGro
m_view = WKViewCreate(viewRect, contextRef, pageGroupRef, m_window);
}
-PlatformWebView::PlatformWebView(WKPageRef pageRef, WKPageGroupRef pageGroupRef)
-{
- registerWindowClass();
-
- RECT viewRect = {0, 0, 800, 600};
- m_window = CreateWindowExW(0, hostWindowClassName, L"WebKitTestRunner", WS_OVERLAPPEDWINDOW, 0 /*XOFFSET*/, 0 /*YOFFSET*/, viewRect.right, viewRect.bottom, 0, 0, GetModuleHandle(0), 0);
- m_view = WKViewCreateForAssociatedPage(viewRect, pageRef, pageGroupRef, m_window);
-}
-
PlatformWebView::~PlatformWebView()
{
if (::IsWindow(m_window))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list