WebKit/chromium/src/FrameLoaderClientImpl.h - Issue 3453022: Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>...

Side by Side Diff: WebKit/chromium/src/FrameLoaderClientImpl.h

Issue 3453022: Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/

Patch Set: Created 10 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62	62

63 // A frame's V8 context was created or destroyed.	63 // A frame's V8 context was created or destroyed.

64 virtual void didCreateScriptContextForFrame();	64 virtual void didCreateScriptContextForFrame();

65 virtual void didDestroyScriptContextForFrame();	65 virtual void didDestroyScriptContextForFrame();

66	66

67 // A context untied to a frame was created (through evaluateInIsolatedWorld) .	67 // A context untied to a frame was created (through evaluateInIsolatedWorld) .

68 // This context is not tied to the lifetime of its frame, and is destroyed	68 // This context is not tied to the lifetime of its frame, and is destroyed

69 // in garbage collection.	69 // in garbage collection.

70 virtual void didCreateIsolatedScriptContext();	70 virtual void didCreateIsolatedScriptContext();

71	71

	72 // Returns true if we should allow the given V8 extension to be added to

	73 // the script context at the currently loading page and given extension grou p.

	74 virtual bool allowScriptExtension(const String& extensionName, int extension Group);

	75

72 virtual bool hasWebView() const;	76 virtual bool hasWebView() const;

73 virtual bool hasFrameView() const;	77 virtual bool hasFrameView() const;

74 virtual void makeRepresentation(WebCore::DocumentLoader*);	78 virtual void makeRepresentation(WebCore::DocumentLoader*);

75 virtual void forceLayout();	79 virtual void forceLayout();

76 virtual void forceLayoutForNonHTML();	80 virtual void forceLayoutForNonHTML();

77 virtual void setCopiesOnScroll();	81 virtual void setCopiesOnScroll();

78 virtual void detachedFromParent2();	82 virtual void detachedFromParent2();

79 virtual void detachedFromParent3();	83 virtual void detachedFromParent3();

80 virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebC ore::DocumentLoader*, const WebCore::ResourceRequest&);	84 virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebC ore::DocumentLoader*, const WebCore::ResourceRequest&);

81 virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirec tResponse);	85 virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirec tResponse);

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235 // which specifies that the plugin should be ready to accept data.	239 // which specifies that the plugin should be ready to accept data.

236 bool m_sentInitialResponseToPlugin;	240 bool m_sentInitialResponseToPlugin;

237	241

238 // The navigation policy to use for the next call to dispatchCreatePage.	242 // The navigation policy to use for the next call to dispatchCreatePage.

239 WebNavigationPolicy m_nextNavigationPolicy;	243 WebNavigationPolicy m_nextNavigationPolicy;

240 };	244 };

241	245

242 } // namespace WebKit	246 } // namespace WebKit

243	247

244 #endif	248 #endif

OLD	NEW

« no previous file with comments | « WebKit/chromium/public/WebScriptController.h ('k') | WebKit/chromium/src/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »