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

Side by Side Diff: Source/devtools/front_end/sdk/CSSStyleModel.js

Issue 1320543002: DevTools: simplify & fix property overload logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 generatedProperties.push(shorthandProperty); 738 generatedProperties.push(shorthandProperty);
739 propertiesSet.add(shorthand); 739 propertiesSet.add(shorthand);
740 } 740 }
741 } 741 }
742 this._allProperties = this._allProperties.concat(generatedProperties); 742 this._allProperties = this._allProperties.concat(generatedProperties);
743 }, 743 },
744 744
745 /** 745 /**
746 * @return {!Array.<!WebInspector.CSSProperty>} 746 * @return {!Array.<!WebInspector.CSSProperty>}
747 */ 747 */
748 leadingProperties: function() 748 _computeLeadingProperties: function()
749 { 749 {
750 /** 750 /**
751 * @param {!WebInspector.CSSProperty} property 751 * @param {!WebInspector.CSSProperty} property
752 * @return {boolean} 752 * @return {boolean}
753 */ 753 */
754 function propertyHasRange(property) 754 function propertyHasRange(property)
755 { 755 {
756 return !!property.range; 756 return !!property.range;
757 } 757 }
758 758
(...skipping 11 matching lines...) Expand all
770 } 770 }
771 } 771 }
772 if (!belongToAnyShorthand) 772 if (!belongToAnyShorthand)
773 leadingProperties.push(property); 773 leadingProperties.push(property);
774 } 774 }
775 775
776 return leadingProperties; 776 return leadingProperties;
777 }, 777 },
778 778
779 /** 779 /**
780 * @return {!Array.<!WebInspector.CSSProperty>}
781 */
782 leadingProperties: function()
783 {
784 if (!this._leadingProperties)
785 this._leadingProperties = this._computeLeadingProperties();
786 return this._leadingProperties;
787 },
788
789 /**
780 * @return {!WebInspector.Target} 790 * @return {!WebInspector.Target}
781 */ 791 */
782 target: function() 792 target: function()
783 { 793 {
784 return this._cssModel.target(); 794 return this._cssModel.target();
785 }, 795 },
786 796
787 /** 797 /**
788 * @return {!WebInspector.CSSStyleModel} 798 * @return {!WebInspector.CSSStyleModel}
789 */ 799 */
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 * @constructor 2004 * @constructor
1995 * @param {?WebInspector.CSSStyleDeclaration} inlineStyle 2005 * @param {?WebInspector.CSSStyleDeclaration} inlineStyle
1996 * @param {?WebInspector.CSSStyleDeclaration} attributesStyle 2006 * @param {?WebInspector.CSSStyleDeclaration} attributesStyle
1997 */ 2007 */
1998 WebInspector.CSSStyleModel.InlineStyleResult = function(inlineStyle, attributesS tyle) 2008 WebInspector.CSSStyleModel.InlineStyleResult = function(inlineStyle, attributesS tyle)
1999 { 2009 {
2000 this.inlineStyle = inlineStyle; 2010 this.inlineStyle = inlineStyle;
2001 this.attributesStyle = attributesStyle; 2011 this.attributesStyle = attributesStyle;
2002 } 2012 }
2003 2013
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698