Title: [99426] trunk/Source/WebCore
- Revision
- 99426
- Author
- [email protected]
- Date
- 2011-11-07 08:31:51 -0800 (Mon, 07 Nov 2011)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=70223
CSSStyleSheet: finding the owner node should be in its own method
Add styleSheetOwnerNode() function that returns the owner Node of the style sheet, or 0.
Reviewed by Dimitri Glazkov.
No new tests. (refactoring)
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::styleSheetOwnerNode):
(WebCore::CSSStyleSheet::document):
* css/CSSStyleSheet.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99425 => 99426)
--- trunk/Source/WebCore/ChangeLog 2011-11-07 16:24:50 UTC (rev 99425)
+++ trunk/Source/WebCore/ChangeLog 2011-11-07 16:31:51 UTC (rev 99426)
@@ -1,3 +1,19 @@
+2011-11-07 Roland Steiner <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=70223
+ CSSStyleSheet: finding the owner node should be in its own method
+
+ Add styleSheetOwnerNode() function that returns the owner Node of the style sheet, or 0.
+
+ Reviewed by Dimitri Glazkov.
+
+ No new tests. (refactoring)
+
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::styleSheetOwnerNode):
+ (WebCore::CSSStyleSheet::document):
+ * css/CSSStyleSheet.h:
+
2011-11-07 Yury Semikhatsky <[email protected]>
[Chromium] Web Inspector: use native worker inspector instead of fake workers
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (99425 => 99426)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-11-07 16:24:50 UTC (rev 99425)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-11-07 16:31:51 UTC (rev 99426)
@@ -245,15 +245,23 @@
owner->startLoadingDynamicSheet();
}
-Document* CSSStyleSheet::document()
+Node* CSSStyleSheet::styleSheetOwnerNode() const
{
- for (CSSStyleSheet* sheet = this; sheet; sheet = sheet->parentStyleSheet()) {
+ for (const CSSStyleSheet* sheet = this; sheet; sheet = sheet->parentStyleSheet()) {
if (Node* ownerNode = sheet->ownerNode())
- return ownerNode->document();
+ return ownerNode;
}
return 0;
}
+Document* CSSStyleSheet::document()
+{
+ Node* ownerNode = styleSheetOwnerNode();
+
+ return ownerNode ? ownerNode->document() : 0;
+}
+
+
void CSSStyleSheet::styleSheetChanged()
{
CSSStyleSheet* rootSheet = this;
Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (99425 => 99426)
--- trunk/Source/WebCore/css/CSSStyleSheet.h 2011-11-07 16:24:50 UTC (rev 99425)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2011-11-07 16:31:51 UTC (rev 99426)
@@ -95,6 +95,7 @@
virtual void checkLoaded();
void startLoadingDynamicSheet();
+ Node* styleSheetOwnerNode() const;
Document* document();
const String& charset() const { return m_charset; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
