Source/WebCore/inspector/InspectorStyleSheet.h - Issue 11841005: Merge 138460

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/inspector/InspectorStyleSheet.h

Issue 11841005: Merge 138460 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 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:

Index: Source/WebCore/inspector/InspectorStyleSheet.h

===================================================================

--- Source/WebCore/inspector/InspectorStyleSheet.h (revision 139385)

+++ Source/WebCore/inspector/InspectorStyleSheet.h (working copy)

@@ -222,9 +222,10 @@

virtual bool setStyleText(CSSStyleDeclaration*, const String&);

private:

+ typedef Vector<RefPtr<CSSStyleRule> > CSSStyleRuleVector;

friend class InspectorStyle;

- static void collectFlatRules(PassRefPtr<CSSRuleList>, Vector<CSSStyleRule*>* result);

+ static void collectFlatRules(PassRefPtr<CSSRuleList>, CSSStyleRuleVector* result);

bool ensureText() const;

bool ensureSourceData();

void ensureFlatRules() const;

@@ -244,7 +245,7 @@

bool m_isRevalidating;

ParsedStyleSheet* m_parsedStyleSheet;

InspectorStyleMap m_inspectorStyles;

- mutable Vector<CSSStyleRule*> m_flatRules;

+ mutable CSSStyleRuleVector m_flatRules;

Listener* m_listener;

};