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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 2136413002: Update Surface ID Terminology (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed webkit_unit_tests Created 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h" 5 #include "content/browser/browser_plugin/browser_plugin_guest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 browser_plugin_instance_id(), surface_id, frame_size, scale_factor, 402 browser_plugin_instance_id(), surface_id, frame_size, scale_factor,
403 sequence)); 403 sequence));
404 } 404 }
405 405
406 void BrowserPluginGuest::OnSatisfySequence( 406 void BrowserPluginGuest::OnSatisfySequence(
407 int instance_id, 407 int instance_id,
408 const cc::SurfaceSequence& sequence) { 408 const cc::SurfaceSequence& sequence) {
409 std::vector<uint32_t> sequences; 409 std::vector<uint32_t> sequences;
410 sequences.push_back(sequence.sequence); 410 sequences.push_back(sequence.sequence);
411 cc::SurfaceManager* manager = GetSurfaceManager(); 411 cc::SurfaceManager* manager = GetSurfaceManager();
412 manager->DidSatisfySequences(sequence.id_namespace, &sequences); 412 manager->DidSatisfySequences(sequence.client_id, &sequences);
413 } 413 }
414 414
415 void BrowserPluginGuest::OnRequireSequence( 415 void BrowserPluginGuest::OnRequireSequence(
416 int instance_id, 416 int instance_id,
417 const cc::SurfaceId& id, 417 const cc::SurfaceId& id,
418 const cc::SurfaceSequence& sequence) { 418 const cc::SurfaceSequence& sequence) {
419 cc::SurfaceManager* manager = GetSurfaceManager(); 419 cc::SurfaceManager* manager = GetSurfaceManager();
420 cc::Surface* surface = manager->GetSurfaceForId(id); 420 cc::Surface* surface = manager->GetSurfaceForId(id);
421 if (!surface) { 421 if (!surface) {
422 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; 422 LOG(ERROR) << "Attempting to require callback on nonexistent surface";
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
1017 range, character_bounds); 1017 range, character_bounds);
1018 } 1018 }
1019 #endif 1019 #endif
1020 1020
1021 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { 1021 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
1022 if (delegate_) 1022 if (delegate_)
1023 delegate_->SetContextMenuPosition(position); 1023 delegate_->SetContextMenuPosition(position);
1024 } 1024 }
1025 1025
1026 } // namespace content 1026 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698