| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 // TODO(creis): Remove this when the RenderView methods dealing with frames | 57 // TODO(creis): Remove this when the RenderView methods dealing with frames |
| 58 // have moved to RenderFrame. | 58 // have moved to RenderFrame. |
| 59 static RenderFrameImpl* FindByWebFrame(blink::WebFrame* web_frame); | 59 static RenderFrameImpl* FindByWebFrame(blink::WebFrame* web_frame); |
| 60 | 60 |
| 61 // Used by content_layouttest_support to hook into the creation of | 61 // Used by content_layouttest_support to hook into the creation of |
| 62 // RenderFrameImpls. | 62 // RenderFrameImpls. |
| 63 static void InstallCreateHook( | 63 static void InstallCreateHook( |
| 64 RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32)); | 64 RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32)); |
| 65 | 65 |
| 66 virtual ~RenderFrameImpl(); | 66 virtual ~RenderFrameImpl(); |
| 67 // TODO(nasko): Remove when no longer needed. |
| 68 // See comment on the implementation of this method for more details. |
| 69 void operator delete(void*); |
| 67 | 70 |
| 68 bool is_swapped_out() const { | 71 bool is_swapped_out() const { |
| 69 return is_swapped_out_; | 72 return is_swapped_out_; |
| 70 } | 73 } |
| 71 | 74 |
| 72 // TODO(jam): this is a temporary getter until all the code is transitioned | 75 // TODO(jam): this is a temporary getter until all the code is transitioned |
| 73 // to using RenderFrame instead of RenderView. | 76 // to using RenderFrame instead of RenderView. |
| 74 RenderViewImpl* render_view() { return render_view_; } | 77 RenderViewImpl* render_view() { return render_view_; } |
| 75 | 78 |
| 76 RendererWebCookieJarImpl* cookie_jar() { return &cookie_jar_; } | 79 RendererWebCookieJarImpl* cookie_jar() { return &cookie_jar_; } |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 377 |
| 375 // All the registered observers. | 378 // All the registered observers. |
| 376 ObserverList<RenderFrameObserver> observers_; | 379 ObserverList<RenderFrameObserver> observers_; |
| 377 | 380 |
| 378 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 381 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 379 }; | 382 }; |
| 380 | 383 |
| 381 } // namespace content | 384 } // namespace content |
| 382 | 385 |
| 383 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 386 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |