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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/elements/StylesSidebarPane.js

Issue 2298903002: DevTools: Modify BezierSwatch to follow same style as ColorSwatch (Closed)
Patch Set: Fix merge conflict Created 4 years, 3 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Joseph Pecoraro 3 * Copyright (C) 2009 Joseph Pecoraro
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1996 matching lines...) Expand 10 before | Expand all | Expand 10 after
2007 { 2007 {
2008 return this.nameElement.textContent + ": " + this.valueElement.textConte nt; 2008 return this.nameElement.textContent + ": " + this.valueElement.textConte nt;
2009 }, 2009 },
2010 2010
2011 /** 2011 /**
2012 * @param {string} text 2012 * @param {string} text
2013 * @return {!Node} 2013 * @return {!Node}
2014 */ 2014 */
2015 _processBezier: function(text) 2015 _processBezier: function(text)
2016 { 2016 {
2017 var geometry = WebInspector.Geometry.CubicBezier.parse(text); 2017 if (!this._editable() || !WebInspector.Geometry.CubicBezier.parse(text))
2018 if (!geometry || !this._editable())
2019 return createTextNode(text); 2018 return createTextNode(text);
2020 var swatchPopoverHelper = this._parentPane._swatchPopoverHelper; 2019 var swatchPopoverHelper = this._parentPane._swatchPopoverHelper;
2021 return new WebInspector.BezierPopoverIcon(this, swatchPopoverHelper, tex t).element(); 2020 var swatch = WebInspector.BezierSwatch.create();
2021 swatch.setBezierText(text);
2022 new WebInspector.BezierPopoverIcon(this, swatchPopoverHelper, swatch);
2023 return swatch;
2022 }, 2024 },
2023 2025
2024 /** 2026 /**
2025 * @param {string} propertyValue 2027 * @param {string} propertyValue
2026 * @param {string} propertyName 2028 * @param {string} propertyName
2027 * @return {!Node} 2029 * @return {!Node}
2028 */ 2030 */
2029 _processShadow: function(propertyValue, propertyName) 2031 _processShadow: function(propertyValue, propertyName)
2030 { 2032 {
2031 if (!this._editable()) 2033 if (!this._editable())
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
3150 3152
3151 /** 3153 /**
3152 * @override 3154 * @override
3153 * @return {!WebInspector.ToolbarItem} 3155 * @return {!WebInspector.ToolbarItem}
3154 */ 3156 */
3155 item: function() 3157 item: function()
3156 { 3158 {
3157 return this._button; 3159 return this._button;
3158 } 3160 }
3159 } 3161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698