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

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

Issue 6592044: Merge 79606 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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
« no previous file with comments | « LayoutTests/fast/replaced/frame-removed-during-resize-smaller-expected.txt ('k') | no next file » | 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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 2768 matching lines...) Expand 10 before | Expand all | Expand 10 after
2779 if (Node* node = d->focusedNode()) { 2779 if (Node* node = d->focusedNode()) {
2780 if (RenderObject* r = node->renderer()) { 2780 if (RenderObject* r = node->renderer()) {
2781 if (r->isTextField()) 2781 if (r->isTextField())
2782 toRenderTextControlSingleLine(r)->capsLockStateMayHaveChanged(); 2782 toRenderTextControlSingleLine(r)->capsLockStateMayHaveChanged();
2783 } 2783 }
2784 } 2784 }
2785 } 2785 }
2786 2786
2787 void EventHandler::sendResizeEvent() 2787 void EventHandler::sendResizeEvent()
2788 { 2788 {
2789 m_frame->document()->dispatchWindowEvent(Event::create(eventNames().resizeEv ent, false, false)); 2789 m_frame->document()->enqueueWindowEvent(Event::create(eventNames().resizeEve nt, false, false));
2790 } 2790 }
2791 2791
2792 void EventHandler::sendScrollEvent() 2792 void EventHandler::sendScrollEvent()
2793 { 2793 {
2794 setFrameWasScrolledByUser(); 2794 setFrameWasScrolledByUser();
2795 if (m_frame->view() && m_frame->document()) 2795 if (m_frame->view() && m_frame->document())
2796 m_frame->document()->eventQueue()->enqueueScrollEvent(m_frame->document( ), EventQueue::ScrollEventDocumentTarget); 2796 m_frame->document()->eventQueue()->enqueueScrollEvent(m_frame->document( ), EventQueue::ScrollEventDocumentTarget);
2797 } 2797 }
2798 2798
2799 void EventHandler::setFrameWasScrolledByUser() 2799 void EventHandler::setFrameWasScrolledByUser()
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2991 touchEventTarget->dispatchEvent(touchEvent.get(), ec); 2991 touchEventTarget->dispatchEvent(touchEvent.get(), ec);
2992 defaultPrevented |= touchEvent->defaultPrevented(); 2992 defaultPrevented |= touchEvent->defaultPrevented();
2993 } 2993 }
2994 } 2994 }
2995 2995
2996 return defaultPrevented; 2996 return defaultPrevented;
2997 } 2997 }
2998 #endif 2998 #endif
2999 2999
3000 } 3000 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/replaced/frame-removed-during-resize-smaller-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698