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

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 379473002: Rename composited selection anchor/focus to start/end (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test Created 6 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
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 if (page_scale_layer_ && inner_viewport_scroll_layer_) { 313 if (page_scale_layer_ && inner_viewport_scroll_layer_) {
314 sync_tree->SetViewportLayersFromIds( 314 sync_tree->SetViewportLayersFromIds(
315 page_scale_layer_->id(), 315 page_scale_layer_->id(),
316 inner_viewport_scroll_layer_->id(), 316 inner_viewport_scroll_layer_->id(),
317 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id() 317 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id()
318 : Layer::INVALID_ID); 318 : Layer::INVALID_ID);
319 } else { 319 } else {
320 sync_tree->ClearViewportLayers(); 320 sync_tree->ClearViewportLayers();
321 } 321 }
322 322
323 sync_tree->RegisterSelection(selection_anchor_, selection_focus_); 323 sync_tree->RegisterSelection(selection_start_, selection_end_);
324 324
325 float page_scale_delta = 325 float page_scale_delta =
326 sync_tree->page_scale_delta() / sync_tree->sent_page_scale_delta(); 326 sync_tree->page_scale_delta() / sync_tree->sent_page_scale_delta();
327 sync_tree->SetPageScaleValues(page_scale_factor_, 327 sync_tree->SetPageScaleValues(page_scale_factor_,
328 min_page_scale_factor_, 328 min_page_scale_factor_,
329 max_page_scale_factor_, 329 max_page_scale_factor_,
330 page_scale_delta); 330 page_scale_delta);
331 sync_tree->set_sent_page_scale_delta(1.f); 331 sync_tree->set_sent_page_scale_delta(1.f);
332 332
333 sync_tree->PassSwapPromises(&swap_promise_list_); 333 sync_tree->PassSwapPromises(&swap_promise_list_);
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 1221
1222 void LayerTreeHost::RegisterViewportLayers( 1222 void LayerTreeHost::RegisterViewportLayers(
1223 scoped_refptr<Layer> page_scale_layer, 1223 scoped_refptr<Layer> page_scale_layer,
1224 scoped_refptr<Layer> inner_viewport_scroll_layer, 1224 scoped_refptr<Layer> inner_viewport_scroll_layer,
1225 scoped_refptr<Layer> outer_viewport_scroll_layer) { 1225 scoped_refptr<Layer> outer_viewport_scroll_layer) {
1226 page_scale_layer_ = page_scale_layer; 1226 page_scale_layer_ = page_scale_layer;
1227 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer; 1227 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer;
1228 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer; 1228 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer;
1229 } 1229 }
1230 1230
1231 void LayerTreeHost::RegisterSelection(const LayerSelectionBound& anchor, 1231 void LayerTreeHost::RegisterSelection(const LayerSelectionBound& start,
1232 const LayerSelectionBound& focus) { 1232 const LayerSelectionBound& end) {
1233 if (selection_anchor_ == anchor && selection_focus_ == focus) 1233 if (selection_start_ == start && selection_end_ == end)
1234 return; 1234 return;
1235 1235
1236 selection_anchor_ = anchor; 1236 selection_start_ = start;
1237 selection_focus_ = focus; 1237 selection_end_ = end;
1238 SetNeedsCommit(); 1238 SetNeedsCommit();
1239 } 1239 }
1240 1240
1241 int LayerTreeHost::ScheduleMicroBenchmark( 1241 int LayerTreeHost::ScheduleMicroBenchmark(
1242 const std::string& benchmark_name, 1242 const std::string& benchmark_name,
1243 scoped_ptr<base::Value> value, 1243 scoped_ptr<base::Value> value,
1244 const MicroBenchmark::DoneCallback& callback) { 1244 const MicroBenchmark::DoneCallback& callback) {
1245 return micro_benchmark_controller_.ScheduleRun( 1245 return micro_benchmark_controller_.ScheduleRun(
1246 benchmark_name, value.Pass(), callback); 1246 benchmark_name, value.Pass(), callback);
1247 } 1247 }
(...skipping 24 matching lines...) Expand all
1272 swap_promise_list_.push_back(swap_promise.Pass()); 1272 swap_promise_list_.push_back(swap_promise.Pass());
1273 } 1273 }
1274 1274
1275 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { 1275 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
1276 for (size_t i = 0; i < swap_promise_list_.size(); i++) 1276 for (size_t i = 0; i < swap_promise_list_.size(); i++)
1277 swap_promise_list_[i]->DidNotSwap(reason); 1277 swap_promise_list_[i]->DidNotSwap(reason);
1278 swap_promise_list_.clear(); 1278 swap_promise_list_.clear();
1279 } 1279 }
1280 1280
1281 } // namespace cc 1281 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698