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

Side by Side Diff: sky/engine/web/WebViewImpl.cpp

Issue 691663002: Unfork Sky's trace events (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/platform/graphics/gpu/DrawingBuffer.cpp ('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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 return EventTypeNames::touchend; 1134 return EventTypeNames::touchend;
1135 case WebInputEvent::TouchCancel: 1135 case WebInputEvent::TouchCancel:
1136 return EventTypeNames::touchcancel; 1136 return EventTypeNames::touchcancel;
1137 default: 1137 default:
1138 return String("unknown"); 1138 return String("unknown");
1139 } 1139 }
1140 } 1140 }
1141 1141
1142 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent) 1142 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
1143 { 1143 {
1144 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii()); 1144 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii().data());
1145 // If we've started a drag and drop operation, ignore input events until 1145 // If we've started a drag and drop operation, ignore input events until
1146 // we're done. 1146 // we're done.
1147 if (m_doingDragAndDrop) 1147 if (m_doingDragAndDrop)
1148 return true; 1148 return true;
1149 1149
1150 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. 1150 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately.
1151 if (m_ignoreInputEvents) 1151 if (m_ignoreInputEvents)
1152 return false; 1152 return false;
1153 1153
1154 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent); 1154 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent);
(...skipping 1250 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 m_layerTreeView->setVisible(visible); 2405 m_layerTreeView->setVisible(visible);
2406 } 2406 }
2407 } 2407 }
2408 2408
2409 bool WebViewImpl::shouldDisableDesktopWorkarounds() 2409 bool WebViewImpl::shouldDisableDesktopWorkarounds()
2410 { 2410 {
2411 return true; 2411 return true;
2412 } 2412 }
2413 2413
2414 } // namespace blink 2414 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/platform/graphics/gpu/DrawingBuffer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698