| 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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 { | 558 { |
| 559 m_callback->completed(Vector<v8::Local<v8::Value>>()); | 559 m_callback->completed(Vector<v8::Local<v8::Value>>()); |
| 560 } | 560 } |
| 561 | 561 |
| 562 private: | 562 private: |
| 563 WebSuspendableExecuteTask(LocalFrame* frame, int worldID, const WillBeHeapVe
ctor<ScriptSourceCode>& sources, int extensionGroup, bool userGesture, WebScript
ExecutionCallback* callback) | 563 WebSuspendableExecuteTask(LocalFrame* frame, int worldID, const WillBeHeapVe
ctor<ScriptSourceCode>& sources, int extensionGroup, bool userGesture, WebScript
ExecutionCallback* callback) |
| 564 : m_frame(frame), m_worldID(worldID), m_sources(sources), m_extensionGro
up(extensionGroup), m_userGesture(userGesture), m_callback(callback) | 564 : m_frame(frame), m_worldID(worldID), m_sources(sources), m_extensionGro
up(extensionGroup), m_userGesture(userGesture), m_callback(callback) |
| 565 { | 565 { |
| 566 } | 566 } |
| 567 | 567 |
| 568 RawPtrWillBeMember<LocalFrame> m_frame; | 568 // FIXME: Oilpan: move (Suspendable)Task to the heap, so that |
| 569 // this reference can be traced. |
| 570 LocalFrame* m_frame; |
| 569 int m_worldID; | 571 int m_worldID; |
| 570 WillBeHeapVector<ScriptSourceCode> m_sources; | 572 WillBePersistentHeapVector<ScriptSourceCode> m_sources; |
| 571 int m_extensionGroup; | 573 int m_extensionGroup; |
| 572 bool m_userGesture; | 574 bool m_userGesture; |
| 573 WebScriptExecutionCallback* m_callback; | 575 WebScriptExecutionCallback* m_callback; |
| 574 }; | 576 }; |
| 575 | 577 |
| 576 // WebFrame ------------------------------------------------------------------- | 578 // WebFrame ------------------------------------------------------------------- |
| 577 | 579 |
| 578 int WebFrame::instanceCount() | 580 int WebFrame::instanceCount() |
| 579 { | 581 { |
| 580 return frameCount; | 582 return frameCount; |
| (...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2095 { | 2097 { |
| 2096 m_frameWidget = frameWidget; | 2098 m_frameWidget = frameWidget; |
| 2097 } | 2099 } |
| 2098 | 2100 |
| 2099 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2101 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2100 { | 2102 { |
| 2101 return m_frameWidget; | 2103 return m_frameWidget; |
| 2102 } | 2104 } |
| 2103 | 2105 |
| 2104 } // namespace blink | 2106 } // namespace blink |
| OLD | NEW |