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

Side by Side Diff: sky/engine/core/page/EventHandler.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/loader/ImageLoader.cpp ('k') | sky/engine/core/page/Page.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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 12 matching lines...) Expand all
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "sky/engine/config.h" 28 #include "sky/engine/config.h"
29 #include "sky/engine/core/page/EventHandler.h" 29 #include "sky/engine/core/page/EventHandler.h"
30 30
31 #include "gen/sky/core/HTMLNames.h" 31 #include "gen/sky/core/HTMLNames.h"
32 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 32 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
33 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 33 #include "sky/engine/bindings2/exception_state_placeholder.h"
34 #include "sky/engine/core/dom/Document.h" 34 #include "sky/engine/core/dom/Document.h"
35 #include "sky/engine/core/dom/DocumentMarkerController.h" 35 #include "sky/engine/core/dom/DocumentMarkerController.h"
36 #include "sky/engine/core/dom/NodeRenderingTraversal.h" 36 #include "sky/engine/core/dom/NodeRenderingTraversal.h"
37 #include "sky/engine/core/dom/shadow/ShadowRoot.h" 37 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
38 #include "sky/engine/core/editing/Editor.h" 38 #include "sky/engine/core/editing/Editor.h"
39 #include "sky/engine/core/editing/FrameSelection.h" 39 #include "sky/engine/core/editing/FrameSelection.h"
40 #include "sky/engine/core/editing/TextIterator.h" 40 #include "sky/engine/core/editing/TextIterator.h"
41 #include "sky/engine/core/editing/htmlediting.h" 41 #include "sky/engine/core/editing/htmlediting.h"
42 #include "sky/engine/core/events/DOMWindowEventQueue.h" 42 #include "sky/engine/core/events/DOMWindowEventQueue.h"
43 #include "sky/engine/core/events/EventPath.h" 43 #include "sky/engine/core/events/EventPath.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 535
536 void EventHandler::focusDocumentView() 536 void EventHandler::focusDocumentView()
537 { 537 {
538 Page* page = m_frame->page(); 538 Page* page = m_frame->page();
539 if (!page) 539 if (!page)
540 return; 540 return;
541 page->focusController().focusDocumentView(m_frame); 541 page->focusController().focusDocumentView(m_frame);
542 } 542 }
543 543
544 } // namespace blink 544 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/loader/ImageLoader.cpp ('k') | sky/engine/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698