Attachment #202104 for bug #116324

View Details Raw Unified Return to Bug 116324



2013-05-17  Anders Carlsson  <andersca@apple.com>

        Make kit(Frame*) more robust
        https://bugs.webkit.org/show_bug.cgi?id=116324

        Reviewed by NOBODY (OOPS!).

        Check that the frame loader's client isn't the EmptyFrameLoaderClient (or a subclass thereof)
        before casting to WebFrameLoaderClient.

        * WebView/WebFrame.mm:
        (kit):

2013-05-17  Anders Carlsson  <andersca@apple.com>

        Move the policy function to WebFramePolicyListener
        https://bugs.webkit.org/show_bug.cgi?id=116323


Lines 226-232 Frame* core(WebFrame *frame) a/Source/WebKit/mac/WebView/WebFrame.mm_sec1
- a/Source/WebKit/mac/WebView/WebFrame.mm -1 / +8 lines
226		226
227	WebFrame kit(Frame frame)	227	WebFrame kit(Frame frame)
228	{	228	{
229	return frame ? static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame() : nil;	229	if (!frame)
		230	return nil;
		231
		232	FrameLoaderClient* frameLoaderClient = frame->loader()->client();
		233	if (frameLoaderClient->isEmptyFrameLoaderClient())
		234	return nil;
		235
		236	return static_cast<WebFrameLoaderClient*>(frameLoaderClient)->webFrame();
230	}	237	}
231		238
232	Page* core(WebView *webView)	239	Page* core(WebView *webView)

Return to Bug 116324

Lines 1-5 a/Source/WebKit/mac/ChangeLog_sec1
- a/Source/WebKit/mac/ChangeLog +13 lines
1	2013-05-17 Anders Carlsson <andersca@apple.com>	1	2013-05-17 Anders Carlsson <andersca@apple.com>
2		2
		3	Make kit(Frame*) more robust
		4	https://bugs.webkit.org/show_bug.cgi?id=116324
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Check that the frame loader's client isn't the EmptyFrameLoaderClient (or a subclass thereof)
		9	before casting to WebFrameLoaderClient.
		10
		11	* WebView/WebFrame.mm:
		12	(kit):
		13
		14	2013-05-17 Anders Carlsson <andersca@apple.com>
		15
3	Move the policy function to WebFramePolicyListener	16	Move the policy function to WebFramePolicyListener
4	https://bugs.webkit.org/show_bug.cgi?id=116323	17	https://bugs.webkit.org/show_bug.cgi?id=116323
5		18