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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2804983003: [blink] Use early returns in baseBackgroundColor(Override) setters. (Closed)
Patch Set: Created 3 years, 8 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 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 m_backgroundColorOverride = color; 295 m_backgroundColorOverride = color;
296 updateLayerTreeBackgroundColor(); 296 updateLayerTreeBackgroundColor();
297 } 297 }
298 298
299 void WebFrameWidgetImpl::clearBackgroundColorOverride() { 299 void WebFrameWidgetImpl::clearBackgroundColorOverride() {
300 m_backgroundColorOverrideEnabled = false; 300 m_backgroundColorOverrideEnabled = false;
301 updateLayerTreeBackgroundColor(); 301 updateLayerTreeBackgroundColor();
302 } 302 }
303 303
304 void WebFrameWidgetImpl::setBaseBackgroundColorOverride(WebColor color) { 304 void WebFrameWidgetImpl::setBaseBackgroundColorOverride(WebColor color) {
305 if (m_baseBackgroundColorOverrideEnabled &&
306 m_baseBackgroundColorOverride == color) {
307 return;
308 }
309
305 m_baseBackgroundColorOverrideEnabled = true; 310 m_baseBackgroundColorOverrideEnabled = true;
306 m_baseBackgroundColorOverride = color; 311 m_baseBackgroundColorOverride = color;
307 updateBaseBackgroundColor(); 312 updateBaseBackgroundColor();
308 } 313 }
309 314
310 void WebFrameWidgetImpl::clearBaseBackgroundColorOverride() { 315 void WebFrameWidgetImpl::clearBaseBackgroundColorOverride() {
316 if (!m_baseBackgroundColorOverrideEnabled)
317 return;
318
311 m_baseBackgroundColorOverrideEnabled = false; 319 m_baseBackgroundColorOverrideEnabled = false;
312 updateBaseBackgroundColor(); 320 updateBaseBackgroundColor();
313 } 321 }
314 322
315 void WebFrameWidgetImpl::layoutAndPaintAsync( 323 void WebFrameWidgetImpl::layoutAndPaintAsync(
316 WebLayoutAndPaintAsyncCallback* callback) { 324 WebLayoutAndPaintAsyncCallback* callback) {
317 m_layerTreeView->layoutAndPaintAsync(callback); 325 m_layerTreeView->layoutAndPaintAsync(callback);
318 } 326 }
319 327
320 void WebFrameWidgetImpl::compositeAndReadbackAsync( 328 void WebFrameWidgetImpl::compositeAndReadbackAsync(
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 return nullptr; 1166 return nullptr;
1159 } 1167 }
1160 1168
1161 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { 1169 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
1162 if (!m_imeAcceptEvents) 1170 if (!m_imeAcceptEvents)
1163 return nullptr; 1171 return nullptr;
1164 return focusedLocalFrameInWidget(); 1172 return focusedLocalFrameInWidget();
1165 } 1173 }
1166 1174
1167 } // namespace blink 1175 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698