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

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

Issue 11644048: Revert 138209 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 8 years 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
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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 m_doc->attach(); 302 m_doc->attach();
303 303
304 if (m_doc) { 304 if (m_doc) {
305 m_script.updateDocument(); 305 m_script.updateDocument();
306 m_doc->updateViewportArguments(); 306 m_doc->updateViewportArguments();
307 } 307 }
308 308
309 if (m_page && m_page->mainFrame() == this) { 309 if (m_page && m_page->mainFrame() == this) {
310 notifyChromeClientWheelEventHandlerCountChanged(); 310 notifyChromeClientWheelEventHandlerCountChanged();
311 #if ENABLE(TOUCH_EVENTS) 311 #if ENABLE(TOUCH_EVENTS)
312 if (m_doc && m_doc->touchEventHandlerCount()) 312 if (m_doc && m_doc->hasTouchEventHandlers())
313 m_page->chrome()->client()->needTouchEvents(true); 313 m_page->chrome()->client()->needTouchEvents(true);
314 #endif 314 #endif
315 } 315 }
316 316
317 // Suspend document if this frame was created in suspended state. 317 // Suspend document if this frame was created in suspended state.
318 if (m_doc && activeDOMObjectsAndAnimationsSuspended()) { 318 if (m_doc && activeDOMObjectsAndAnimationsSuspended()) {
319 m_doc->suspendScriptedAnimationControllerCallbacks(); 319 m_doc->suspendScriptedAnimationControllerCallbacks();
320 m_animationController.suspendAnimationsForDocument(m_doc.get()); 320 m_animationController.suspendAnimationsForDocument(m_doc.get());
321 m_doc->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended); 321 m_doc->suspendActiveDOMObjects(ActiveDOMObject::PageWillBeSuspended);
322 } 322 }
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 1129
1130 m_view->paintContents(buffer->context(), paintingRect); 1130 m_view->paintContents(buffer->context(), paintingRect);
1131 1131
1132 RefPtr<Image> image = buffer->copyImage(); 1132 RefPtr<Image> image = buffer->copyImage();
1133 return createDragImageFromImage(image.get()); 1133 return createDragImageFromImage(image.get());
1134 } 1134 }
1135 1135
1136 #endif 1136 #endif
1137 1137
1138 } // namespace WebCore 1138 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/page/EventHandler.cpp ('k') | Source/WebCore/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698