diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/html/HTMLStyleElement.h | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/html/HTMLStyleElement.h')
| -rw-r--r-- | Source/WebCore/html/HTMLStyleElement.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLStyleElement.h b/Source/WebCore/html/HTMLStyleElement.h index 7e3125454..63a82c4ee 100644 --- a/Source/WebCore/html/HTMLStyleElement.h +++ b/Source/WebCore/html/HTMLStyleElement.h @@ -76,15 +76,22 @@ private: virtual const AtomicString& media() const; virtual const AtomicString& type() const; - void registerWithScopingNode(); - void unregisterWithScopingNode() { unregisterWithScopingNode(parentNode()); } - void unregisterWithScopingNode(ContainerNode* scope); +#if ENABLE(STYLE_SCOPED) + void scopedAttributeChanged(bool); + void registerWithScopingNode(bool); + void unregisterWithScopingNode(ContainerNode*); +#endif bool m_firedLoad; bool m_loadedSheet; #if ENABLE(STYLE_SCOPED) - bool m_isRegisteredWithScopingNode; + enum ScopedStyleRegistrationState { + NotRegistered, + RegisteredAsScoped, + RegisteredInShadowRoot + }; + ScopedStyleRegistrationState m_scopedStyleRegistrationState; #endif }; |