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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 7426001: Make unfiltered events default to 'handled'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | « no previous file | 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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 (input_event_mask_ & event_class)) { 442 (input_event_mask_ & event_class)) {
443 // Actually send the event. 443 // Actually send the event.
444 std::vector< ::ppapi::InputEventData > events; 444 std::vector< ::ppapi::InputEventData > events;
445 CreateInputEventData(event, &events); 445 CreateInputEventData(event, &events);
446 446
447 // Each input event may generate more than one PP_InputEvent. 447 // Each input event may generate more than one PP_InputEvent.
448 ResourceTracker* tracker = ResourceTracker::Get(); 448 ResourceTracker* tracker = ResourceTracker::Get();
449 for (size_t i = 0; i < events.size(); i++) { 449 for (size_t i = 0; i < events.size(); i++) {
450 if (filtered_input_event_mask_ & event_class) 450 if (filtered_input_event_mask_ & event_class)
451 events[i].is_filtered = true; 451 events[i].is_filtered = true;
452 else
453 rv = true; // Unfiltered events are assumed to be handled.
452 scoped_refptr<PPB_InputEvent_Impl> event_resource( 454 scoped_refptr<PPB_InputEvent_Impl> event_resource(
453 new PPB_InputEvent_Impl(this, events[i])); 455 new PPB_InputEvent_Impl(this, events[i]));
454 PP_Resource resource = event_resource->GetReference(); 456 PP_Resource resource = event_resource->GetReference();
455 457
456 rv |= PPBoolToBool(plugin_input_event_interface_->HandleInputEvent( 458 rv |= PPBoolToBool(plugin_input_event_interface_->HandleInputEvent(
457 pp_instance(), event_resource->GetReference())); 459 pp_instance(), event_resource->GetReference()));
458 460
459 // Release the reference we took above. 461 // Release the reference we took above.
460 tracker->UnrefResource(resource); 462 tracker->UnrefResource(resource);
461 } 463 }
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 } 1539 }
1538 delegate()->ZoomLimitsChanged(minimum_factor, maximium_factor); 1540 delegate()->ZoomLimitsChanged(minimum_factor, maximium_factor);
1539 } 1541 }
1540 1542
1541 void PluginInstance::PostMessage(PP_Instance instance, PP_Var message) { 1543 void PluginInstance::PostMessage(PP_Instance instance, PP_Var message) {
1542 message_channel_->PostMessageToJavaScript(message); 1544 message_channel_->PostMessageToJavaScript(message);
1543 } 1545 }
1544 1546
1545 } // namespace ppapi 1547 } // namespace ppapi
1546 } // namespace webkit 1548 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698