diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/inspector/InspectorStyleSheet.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/inspector/InspectorStyleSheet.h')
| -rw-r--r-- | Source/WebCore/inspector/InspectorStyleSheet.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebCore/inspector/InspectorStyleSheet.h b/Source/WebCore/inspector/InspectorStyleSheet.h index 3048b1b..f98b49e 100644 --- a/Source/WebCore/inspector/InspectorStyleSheet.h +++ b/Source/WebCore/inspector/InspectorStyleSheet.h @@ -49,6 +49,8 @@ class Node; #if ENABLE(INSPECTOR) +typedef String ErrorString; + class InspectorCSSId { public: InspectorCSSId() { } @@ -127,8 +129,8 @@ public: CSSStyleDeclaration* cssStyle() const { return m_style.get(); } PassRefPtr<InspectorObject> buildObjectForStyle() const; bool hasDisabledProperties() const { return !m_disabledProperties.isEmpty(); } - bool setPropertyText(unsigned index, const String& text, bool overwrite); - bool toggleProperty(unsigned index, bool disable); + bool setPropertyText(ErrorString*, unsigned index, const String& text, bool overwrite); + bool toggleProperty(ErrorString*, unsigned index, bool disable); private: InspectorStyle(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet); @@ -171,8 +173,8 @@ public: PassRefPtr<InspectorObject> buildObjectForStyleSheetInfo(); PassRefPtr<InspectorObject> buildObjectForRule(CSSStyleRule*); PassRefPtr<InspectorObject> buildObjectForStyle(CSSStyleDeclaration*); - bool setPropertyText(const InspectorCSSId&, unsigned propertyIndex, const String& text, bool overwrite); - bool toggleProperty(const InspectorCSSId&, unsigned propertyIndex, bool disable); + bool setPropertyText(ErrorString*, const InspectorCSSId&, unsigned propertyIndex, const String& text, bool overwrite); + bool toggleProperty(ErrorString*, const InspectorCSSId&, unsigned propertyIndex, bool disable); virtual bool text(String* result) const; virtual CSSStyleDeclaration* styleForId(const InspectorCSSId&) const; |