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

Side by Side Diff: content/test/layouttest_support.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "cc/blink/web_layer_impl.h" 9 #include "cc/blink/web_layer_impl.h"
10 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h" 10 #include "content/browser/bluetooth/bluetooth_dispatcher_host.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 PageStateToHistoryEntry(page_state[index])); 415 PageStateToHistoryEntry(page_state[index]));
416 result.append( 416 result.append(
417 DumpHistoryItem(entry->root_history_node(), 417 DumpHistoryItem(entry->root_history_node(),
418 8, 418 8,
419 index == current_index)); 419 index == current_index));
420 } 420 }
421 result.append("===============================================\n"); 421 result.append("===============================================\n");
422 return result; 422 return result;
423 } 423 }
424 424
425 scoped_refptr<cc::TextureLayer> CreateTextureLayerForMailbox(
426 cc::TextureLayerClient* client) {
427 return cc::TextureLayer::CreateForMailbox(
428 cc_blink::WebLayerImpl::LayerSettings(), client);
429 }
430
425 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { 431 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
426 return new cc_blink::WebLayerImpl(layer); 432 return new cc_blink::WebLayerImpl(layer);
427 } 433 }
428 434
429 } // namespace content 435 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698