[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 15:38:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 733edd4b3a7e5829e0007369587ae5c4dc911e24
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 21:01:14 2010 +0000
Get rid of FindPageOverlay
https://bugs.webkit.org/show_bug.cgi?id=49268
Reviewed by Sam Weinig.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
Remove files.
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::findString):
Create a PageOverlay with the FindController as its client.
(WebKit::FindController::willMoveToWebPage):
Null out the find page overlay if the web page is null.
(WebKit::FindController::didMoveToWebPage):
Add stub.
* WebProcess/WebPage/FindController.h:
FindController is now a PageOverlay::Client.
* WebProcess/WebPage/FindPageOverlay.cpp: Removed.
* WebProcess/WebPage/FindPageOverlay.h: Removed.
* WebProcess/WebPage/PageOverlay.cpp:
(WebKit::PageOverlay::setPage):
Call the willMoveToWebPage and didMoveToWebPage client functions.
(WebKit::PageOverlay::setNeedsDisplay):
Pass the page overlay bounds instead of the web page size.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::installPageOverlay):
Clear the page of the previous page overlay.
(WebKit::WebPage::uninstallPageOverlay):
Clear the page of the previous page overlay.
* WebProcess/WebPage/WebPage.h:
The page overlay is now refcounted.
* win/WebKit2.vcproj:
Remove files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7f9885c..d7a8350 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,49 @@
+2010-11-09 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Get rid of FindPageOverlay
+ https://bugs.webkit.org/show_bug.cgi?id=49268
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ Remove files.
+
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::findString):
+ Create a PageOverlay with the FindController as its client.
+
+ (WebKit::FindController::willMoveToWebPage):
+ Null out the find page overlay if the web page is null.
+
+ (WebKit::FindController::didMoveToWebPage):
+ Add stub.
+
+ * WebProcess/WebPage/FindController.h:
+ FindController is now a PageOverlay::Client.
+
+ * WebProcess/WebPage/FindPageOverlay.cpp: Removed.
+ * WebProcess/WebPage/FindPageOverlay.h: Removed.
+ * WebProcess/WebPage/PageOverlay.cpp:
+ (WebKit::PageOverlay::setPage):
+ Call the willMoveToWebPage and didMoveToWebPage client functions.
+
+ (WebKit::PageOverlay::setNeedsDisplay):
+ Pass the page overlay bounds instead of the web page size.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::installPageOverlay):
+ Clear the page of the previous page overlay.
+
+ (WebKit::WebPage::uninstallPageOverlay):
+ Clear the page of the previous page overlay.
+
+ * WebProcess/WebPage/WebPage.h:
+ The page overlay is now refcounted.
+
+ * win/WebKit2.vcproj:
+ Remove files.
+
2010-11-09 Sam Weinig <sam at webkit.org>
Fix windows build.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 87307ef..e35dfd1 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -350,7 +350,6 @@ HEADERS += \
WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
WebProcess/WebPage/DrawingArea.h \
WebProcess/WebPage/FindController.h \
- WebProcess/WebPage/FindPageOverlay.h \
WebProcess/WebPage/PageOverlay.h \
WebProcess/WebPage/WebContextMenu.h \
WebProcess/WebPage/WebEditCommand.h \
@@ -524,7 +523,6 @@ SOURCES += \
WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
WebProcess/WebPage/DrawingArea.cpp \
WebProcess/WebPage/FindController.cpp \
- WebProcess/WebPage/FindPageOverlay.cpp \
WebProcess/WebPage/PageOverlay.cpp \
WebProcess/WebPage/WebContextMenu.cpp \
WebProcess/WebPage/WebEditCommand.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 22de804..afb2539 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -145,8 +145,6 @@
1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A90C1F31264FD71003E44D4 /* FindController.cpp */; };
1A90C23712650717003E44D4 /* PageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A90C23512650717003E44D4 /* PageOverlay.h */; };
1A90C23812650717003E44D4 /* PageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A90C23612650717003E44D4 /* PageOverlay.cpp */; };
- 1A90C2A312650C60003E44D4 /* FindPageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A90C2A112650C60003E44D4 /* FindPageOverlay.h */; };
- 1A90C2A412650C60003E44D4 /* FindPageOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A90C2A212650C60003E44D4 /* FindPageOverlay.cpp */; };
1A910071126675C4001842F5 /* FindIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* FindIndicator.h */; };
1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* FindIndicator.cpp */; };
1A91010A1268C8CA001842F5 /* FindIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */; };
@@ -687,8 +685,6 @@
1A90C1F31264FD71003E44D4 /* FindController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindController.cpp; sourceTree = "<group>"; };
1A90C23512650717003E44D4 /* PageOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageOverlay.h; sourceTree = "<group>"; };
1A90C23612650717003E44D4 /* PageOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageOverlay.cpp; sourceTree = "<group>"; };
- 1A90C2A112650C60003E44D4 /* FindPageOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindPageOverlay.h; sourceTree = "<group>"; };
- 1A90C2A212650C60003E44D4 /* FindPageOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindPageOverlay.cpp; sourceTree = "<group>"; };
1A91006F126675C3001842F5 /* FindIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicator.h; sourceTree = "<group>"; };
1A910070126675C4001842F5 /* FindIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindIndicator.cpp; sourceTree = "<group>"; };
1A9101081268C8CA001842F5 /* FindIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicatorWindow.h; sourceTree = "<group>"; };
@@ -1572,8 +1568,6 @@
BC8452A61162C80900CAB9B5 /* DrawingArea.h */,
1A90C1F31264FD71003E44D4 /* FindController.cpp */,
1A90C1F21264FD71003E44D4 /* FindController.h */,
- 1A90C2A212650C60003E44D4 /* FindPageOverlay.cpp */,
- 1A90C2A112650C60003E44D4 /* FindPageOverlay.h */,
0F5265B111DD37680006D33C /* LayerBackedDrawingArea.cpp */,
0F5265B211DD37680006D33C /* LayerBackedDrawingArea.h */,
1A90C23612650717003E44D4 /* PageOverlay.cpp */,
@@ -2331,7 +2325,6 @@
1A90C1EE1264FD50003E44D4 /* FindOptions.h in Headers */,
1A90C1F41264FD71003E44D4 /* FindController.h in Headers */,
1A90C23712650717003E44D4 /* PageOverlay.h in Headers */,
- 1A90C2A312650C60003E44D4 /* FindPageOverlay.h in Headers */,
BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
1A910071126675C4001842F5 /* FindIndicator.h in Headers */,
@@ -2672,7 +2665,6 @@
1AC41AC81263C88300054E94 /* BinarySemaphore.cpp in Sources */,
1A90C1F51264FD71003E44D4 /* FindController.cpp in Sources */,
1A90C23812650717003E44D4 /* PageOverlay.cpp in Sources */,
- 1A90C2A412650C60003E44D4 /* FindPageOverlay.cpp in Sources */,
C01A260112662F2100C9ED55 /* BackingStoreCG.cpp in Sources */,
BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */,
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index 7b747dc..c762ed6 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -26,7 +26,6 @@
#include "FindController.h"
#include "BackingStore.h"
-#include "FindPageOverlay.h"
#include "WKPage.h"
#include "WebCoreArgumentCoders.h"
#include "WebPage.h"
@@ -123,7 +122,7 @@ void FindController::findString(const String& string, FindDirection findDirectio
}
if (!m_findPageOverlay) {
- OwnPtr<FindPageOverlay> findPageOverlay = FindPageOverlay::create(this);
+ RefPtr<PageOverlay> findPageOverlay = PageOverlay::create(this);
m_findPageOverlay = findPageOverlay.get();
m_webPage->installPageOverlay(findPageOverlay.release());
} else {
@@ -140,12 +139,6 @@ void FindController::hideFindUI()
hideFindIndicator();
}
-void FindController::findPageOverlayDestroyed()
-{
- ASSERT(m_findPageOverlay);
- m_findPageOverlay = 0;
-}
-
bool FindController::updateFindIndicator(Frame* selectedFrame, bool isShowingOverlay)
{
if (!selectedFrame)
@@ -223,6 +216,20 @@ Vector<IntRect> FindController::rectsForTextMatches()
return rects;
}
+void FindController::willMoveToWebPage(PageOverlay*, WebPage* webPage)
+{
+ if (webPage)
+ return;
+
+ // The page overlay is moving away from the web page, reset it.
+ ASSERT(m_findPageOverlay);
+ m_findPageOverlay = 0;
+}
+
+void FindController::didMoveToWebPage(PageOverlay*, WebPage*)
+{
+}
+
static const float shadowOffsetX = 0.0;
static const float shadowOffsetY = 1.0;
static const float shadowBlurRadius = 2.0;
diff --git a/WebKit2/WebProcess/WebPage/FindController.h b/WebKit2/WebProcess/WebPage/FindController.h
index a0e726e..c5bad25 100644
--- a/WebKit2/WebProcess/WebPage/FindController.h
+++ b/WebKit2/WebProcess/WebPage/FindController.h
@@ -39,10 +39,9 @@ namespace WebCore {
namespace WebKit {
-class FindPageOverlay;
class WebPage;
-class FindController {
+class FindController : private PageOverlay::Client {
WTF_MAKE_NONCOPYABLE(FindController);
public:
@@ -53,23 +52,21 @@ public:
void hideFindUI();
void countStringMatches(const String&, bool caseInsensitive, unsigned maxMatchCount);
- void findPageOverlayDestroyed();
-
void hideFindIndicator();
private:
- bool updateFindIndicator(WebCore::Frame* selectedFrame, bool isShowingOverlay);
-
- // FIXME: These three member functions should be private once FindPageOverlay has been removed.
-public:
- Vector<WebCore::IntRect> rectsForTextMatches();
// PageOverlay::Client.
+ virtual void willMoveToWebPage(PageOverlay*, WebPage*);
+ virtual void didMoveToWebPage(PageOverlay*, WebPage*);
virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&);
virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect);
+ Vector<WebCore::IntRect> rectsForTextMatches();
+ bool updateFindIndicator(WebCore::Frame* selectedFrame, bool isShowingOverlay);
+
private:
WebPage* m_webPage;
- FindPageOverlay* m_findPageOverlay;
+ PageOverlay* m_findPageOverlay;
// Whether the UI process is showing the find indicator. Note that this can be true even if
// the find indicator isn't showing, but it will never be false when it is showing.
diff --git a/WebKit2/WebProcess/WebPage/FindPageOverlay.cpp b/WebKit2/WebProcess/WebPage/FindPageOverlay.cpp
deleted file mode 100644
index 3e57473..0000000
--- a/WebKit2/WebProcess/WebPage/FindPageOverlay.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "FindPageOverlay.h"
-
-#include "FindController.h"
-#include "WebPage.h"
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/GraphicsContext.h>
-#include <WebCore/Page.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-PassOwnPtr<FindPageOverlay> FindPageOverlay::create(FindController* findController)
-{
- return adoptPtr(new FindPageOverlay(findController));
-}
-
-FindPageOverlay::FindPageOverlay(FindController* findController)
- : PageOverlay(this)
- , m_findController(findController)
-{
-}
-
-FindPageOverlay::~FindPageOverlay()
-{
- m_findController->findPageOverlayDestroyed();
-}
-
-void FindPageOverlay::drawRect(PageOverlay* pageOverlay, GraphicsContext& graphicsContext, const IntRect& dirtyRect)
-{
- m_findController->drawRect(pageOverlay, graphicsContext, dirtyRect);
-}
-
-bool FindPageOverlay::mouseEvent(PageOverlay* pageOverlay, const WebMouseEvent& event)
-{
- return m_findController->mouseEvent(pageOverlay, event);
-}
-
-} // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/FindPageOverlay.h b/WebKit2/WebProcess/WebPage/FindPageOverlay.h
deleted file mode 100644
index 7c64ccb..0000000
--- a/WebKit2/WebProcess/WebPage/FindPageOverlay.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FindPageOverlay_h
-#define FindPageOverlay_h
-
-#include "PageOverlay.h"
-#include <wtf/PassOwnPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-class FindController;
-
-class FindPageOverlay : public PageOverlay, public PageOverlay::Client {
-public:
- static PassOwnPtr<FindPageOverlay> create(FindController*);
- virtual ~FindPageOverlay();
-
-private:
- explicit FindPageOverlay(FindController*);
-
- // PageOverlay::Client.
- virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect);
- virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&);
-
- FindController* m_findController;
-};
-
-} // namespace WebKit
-
-#endif // FindPageOverlay_h
diff --git a/WebKit2/WebProcess/WebPage/PageOverlay.cpp b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
index 4aad8b2..710314d 100644
--- a/WebKit2/WebProcess/WebPage/PageOverlay.cpp
+++ b/WebKit2/WebProcess/WebPage/PageOverlay.cpp
@@ -65,15 +65,14 @@ IntRect PageOverlay::bounds() const
void PageOverlay::setPage(WebPage* webPage)
{
- ASSERT(!m_webPage);
-
+ m_client->willMoveToWebPage(this, webPage);
m_webPage = webPage;
- setNeedsDisplay();
+ m_client->didMoveToWebPage(this, webPage);
}
void PageOverlay::setNeedsDisplay()
{
- m_webPage->drawingArea()->setNeedsDisplay(IntRect(IntPoint(), m_webPage->size()));
+ m_webPage->drawingArea()->setNeedsDisplay(bounds());
}
void PageOverlay::drawRect(GraphicsContext& graphicsContext, const IntRect& dirtyRect)
diff --git a/WebKit2/WebProcess/WebPage/PageOverlay.h b/WebKit2/WebProcess/WebPage/PageOverlay.h
index f68d508..849ff35 100644
--- a/WebKit2/WebProcess/WebPage/PageOverlay.h
+++ b/WebKit2/WebProcess/WebPage/PageOverlay.h
@@ -46,6 +46,8 @@ public:
virtual ~Client() { }
public:
+ virtual void willMoveToWebPage(PageOverlay*, WebPage*) = 0;
+ virtual void didMoveToWebPage(PageOverlay*, WebPage*) = 0;
virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect) = 0;
virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&) = 0;
};
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 2a72581..1153c99 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -467,15 +467,20 @@ double WebPage::viewScaleFactor() const
return frame->pageScaleFactor();
}
-void WebPage::installPageOverlay(PassOwnPtr<PageOverlay> pageOverlay)
+void WebPage::installPageOverlay(PassRefPtr<PageOverlay> pageOverlay)
{
+ if (m_pageOverlay)
+ pageOverlay->setPage(0);
+
m_pageOverlay = pageOverlay;
m_pageOverlay->setPage(this);
+ m_pageOverlay->setNeedsDisplay();
}
void WebPage::uninstallPageOverlay()
{
- m_pageOverlay = 0;
+ m_pageOverlay->setPage(0);
+ m_pageOverlay = nullptr;
m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
}
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 00d78b7..fad5053 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -180,7 +180,7 @@ public:
HWND nativeWindow() const { return m_nativeWindow; }
#endif
- void installPageOverlay(PassOwnPtr<PageOverlay>);
+ void installPageOverlay(PassRefPtr<PageOverlay>);
void uninstallPageOverlay();
static const WebEvent* currentEvent();
@@ -299,7 +299,7 @@ private:
InjectedBundlePageUIClient m_uiClient;
FindController m_findController;
- OwnPtr<PageOverlay> m_pageOverlay;
+ RefPtr<PageOverlay> m_pageOverlay;
OwnPtr<WebInspector> m_inspector;
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index b4c47a7..5e3ff55 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -1192,14 +1192,6 @@
>
</File>
<File
- RelativePath="..\WebProcess\WebPage\FindPageOverlay.cpp"
- >
- </File>
- <File
- RelativePath="..\WebProcess\WebPage\FindPageOverlay.h"
- >
- </File>
- <File
RelativePath="..\WebProcess\WebPage\PageOverlay.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list