Commit 8ff56d59 authored by jhoneycutt@apple.com's avatar jhoneycutt@apple.com

2008-03-20 Jon Honeycutt <jhoneycutt@apple.com>

        Reviewed by Anders.

        Fix Windows warning / leak: warning C4150: deletion of pointer to
        incomplete type 'WebCore::PluginRequest'; no destructor called

        * plugins/PluginView.cpp: Move PluginRequest class to PluginView.h so
        Windows PluginView destructor can use WTF::deleteAllValues to clean up
        m_requests.
        * plugins/PluginView.h:
        (WebCore::PluginRequest::PluginRequest):
        (WebCore::PluginRequest::frameLoadRequest):
        (WebCore::PluginRequest::notifyData):
        (WebCore::PluginRequest::sendNotification):
        (WebCore::PluginRequest::shouldAllowPopups):




git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31196 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7bba3d8b
2008-03-20 Jon Honeycutt <jhoneycutt@apple.com>
Reviewed by Anders.
Fix Windows warning / leak: warning C4150: deletion of pointer to
incomplete type 'WebCore::PluginRequest'; no destructor called
* plugins/PluginView.cpp: Move PluginRequest class to PluginView.h so
Windows PluginView destructor can use WTF::deleteAllValues to clean up
m_requests.
* plugins/PluginView.h:
(WebCore::PluginRequest::PluginRequest):
(WebCore::PluginRequest::frameLoadRequest):
(WebCore::PluginRequest::notifyData):
(WebCore::PluginRequest::sendNotification):
(WebCore::PluginRequest::shouldAllowPopups):
2008-03-20 Mark Rowe <mrowe@apple.com> 2008-03-20 Mark Rowe <mrowe@apple.com>
Reviewed by Sam Weinig. Reviewed by Sam Weinig.
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "Element.h" #include "Element.h"
#include "EventNames.h" #include "EventNames.h"
#include "FrameLoader.h" #include "FrameLoader.h"
#include "FrameLoadRequest.h"
#include "FrameTree.h" #include "FrameTree.h"
#include "Frame.h" #include "Frame.h"
#include "FrameView.h" #include "FrameView.h"
...@@ -81,25 +80,6 @@ namespace WebCore { ...@@ -81,25 +80,6 @@ namespace WebCore {
using namespace EventNames; using namespace EventNames;
using namespace HTMLNames; using namespace HTMLNames;
class PluginRequest {
public:
PluginRequest(const FrameLoadRequest& frameLoadRequest, bool sendNotification, void* notifyData, bool shouldAllowPopups)
: m_frameLoadRequest(frameLoadRequest)
, m_notifyData(notifyData)
, m_sendNotification(sendNotification)
, m_shouldAllowPopups(shouldAllowPopups) { }
public:
const FrameLoadRequest& frameLoadRequest() const { return m_frameLoadRequest; }
void* notifyData() const { return m_notifyData; }
bool sendNotification() const { return m_sendNotification; }
bool shouldAllowPopups() const { return m_shouldAllowPopups; }
private:
FrameLoadRequest m_frameLoadRequest;
void* m_notifyData;
bool m_sendNotification;
bool m_shouldAllowPopups;
};
static int s_callingPlugin; static int s_callingPlugin;
static String scriptStringIfJavaScriptURL(const KURL& url) static String scriptStringIfJavaScriptURL(const KURL& url)
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define PluginView_H #define PluginView_H
#include "CString.h" #include "CString.h"
#include "FrameLoadRequest.h"
#include "IntRect.h" #include "IntRect.h"
#include "KURL.h" #include "KURL.h"
#include "PlatformString.h" #include "PlatformString.h"
...@@ -52,7 +53,6 @@ namespace KJS { ...@@ -52,7 +53,6 @@ namespace KJS {
namespace WebCore { namespace WebCore {
class Element; class Element;
class Frame; class Frame;
struct FrameLoadRequest;
class KeyboardEvent; class KeyboardEvent;
class MouseEvent; class MouseEvent;
class KURL; class KURL;
...@@ -71,6 +71,25 @@ namespace WebCore { ...@@ -71,6 +71,25 @@ namespace WebCore {
PluginStatusLoadedSuccessfully PluginStatusLoadedSuccessfully
}; };
class PluginRequest {
public:
PluginRequest(const FrameLoadRequest& frameLoadRequest, bool sendNotification, void* notifyData, bool shouldAllowPopups)
: m_frameLoadRequest(frameLoadRequest)
, m_notifyData(notifyData)
, m_sendNotification(sendNotification)
, m_shouldAllowPopups(shouldAllowPopups) { }
public:
const FrameLoadRequest& frameLoadRequest() const { return m_frameLoadRequest; }
void* notifyData() const { return m_notifyData; }
bool sendNotification() const { return m_sendNotification; }
bool shouldAllowPopups() const { return m_shouldAllowPopups; }
private:
FrameLoadRequest m_frameLoadRequest;
void* m_notifyData;
bool m_sendNotification;
bool m_shouldAllowPopups;
};
class PluginView : public Widget, private PluginStreamClient { class PluginView : public Widget, private PluginStreamClient {
#if PLATFORM(WIN) #if PLATFORM(WIN)
friend static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM); friend static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment