Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Side by Side Diff: Source/core/page/Frame.cpp

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/Frame.h ('k') | Source/core/page/Navigator.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 WTF::StringStatics::init(); 152 WTF::StringStatics::init();
153 QualifiedName::init(); 153 QualifiedName::init();
154 } 154 }
155 155
156 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader Client* frameLoaderClient) 156 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader Client* frameLoaderClient)
157 : m_page(page) 157 : m_page(page)
158 , m_treeNode(this, parentFromOwnerElement(ownerElement)) 158 , m_treeNode(this, parentFromOwnerElement(ownerElement))
159 , m_loader(this, frameLoaderClient) 159 , m_loader(this, frameLoaderClient)
160 , m_navigationScheduler(this) 160 , m_navigationScheduler(this)
161 , m_ownerElement(ownerElement) 161 , m_ownerElement(ownerElement)
162 , m_script(this) 162 , m_script(adoptPtr(new ScriptController(this)))
163 , m_editor(this) 163 , m_editor(this)
164 , m_selection(this) 164 , m_selection(this)
165 , m_eventHandler(this) 165 , m_eventHandler(this)
166 , m_animationController(this) 166 , m_animationController(this)
167 , m_pageZoomFactor(parentPageZoomFactor(this)) 167 , m_pageZoomFactor(parentPageZoomFactor(this))
168 , m_textZoomFactor(parentTextZoomFactor(this)) 168 , m_textZoomFactor(parentTextZoomFactor(this))
169 #if ENABLE(ORIENTATION_EVENTS) 169 #if ENABLE(ORIENTATION_EVENTS)
170 , m_orientation(0) 170 , m_orientation(0)
171 #endif 171 #endif
172 , m_inViewSourceMode(false) 172 , m_inViewSourceMode(false)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_view.get( )); 283 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_view.get( ));
284 } 284 }
285 } 285 }
286 286
287 selection()->updateSecureKeyboardEntryIfActive(); 287 selection()->updateSecureKeyboardEntryIfActive();
288 288
289 if (m_doc && !m_doc->attached()) 289 if (m_doc && !m_doc->attached())
290 m_doc->attach(); 290 m_doc->attach();
291 291
292 if (m_doc) { 292 if (m_doc) {
293 m_script.updateDocument(); 293 m_script->updateDocument();
294 m_doc->updateViewportArguments(); 294 m_doc->updateViewportArguments();
295 } 295 }
296 296
297 if (m_page && m_page->mainFrame() == this) { 297 if (m_page && m_page->mainFrame() == this) {
298 notifyChromeClientWheelEventHandlerCountChanged(); 298 notifyChromeClientWheelEventHandlerCountChanged();
299 #if ENABLE(TOUCH_EVENTS) 299 #if ENABLE(TOUCH_EVENTS)
300 if (m_doc && m_doc->hasTouchEventHandlers()) 300 if (m_doc && m_doc->hasTouchEventHandlers())
301 m_page->chrome()->client()->needTouchEvents(true); 301 m_page->chrome()->client()->needTouchEvents(true);
302 #endif 302 #endif
303 } 303 }
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 buffer->context()->translate(-paintingRect.x(), -paintingRect.y()); 966 buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
967 buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.ma xY())); 967 buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.ma xY()));
968 968
969 m_view->paintContents(buffer->context(), paintingRect); 969 m_view->paintContents(buffer->context(), paintingRect);
970 970
971 RefPtr<Image> image = buffer->copyImage(); 971 RefPtr<Image> image = buffer->copyImage();
972 return createDragImageFromImage(image.get()); 972 return createDragImageFromImage(image.get());
973 } 973 }
974 974
975 } // namespace WebCore 975 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Frame.h ('k') | Source/core/page/Navigator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698