Title: [147751] trunk/Source/WebCore
Revision
147751
Author
allan.jen...@digia.com
Date
2013-04-05 09:13:06 -0700 (Fri, 05 Apr 2013)

Log Message

Fix GCC with C++11 build
https://bugs.webkit.org/show_bug.cgi?id=111579

Reviewed by Anders Carlsson.

If the destructor is private, MemoryInstrumentation can not create an inherited class.

* css/PropertySetCSSStyleDeclaration.h:
(StyleRuleCSSStyleDeclaration):
* dom/ShadowRoot.h:
(ShadowRoot):
* loader/SubresourceLoader.h:
(SubresourceLoader):
* platform/Timer.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (147750 => 147751)


--- trunk/Source/WebCore/ChangeLog	2013-04-05 15:52:08 UTC (rev 147750)
+++ trunk/Source/WebCore/ChangeLog	2013-04-05 16:13:06 UTC (rev 147751)
@@ -1,3 +1,20 @@
+2013-04-05  Allan Sandfeld Jensen  <allan.jen...@digia.com>
+
+        Fix GCC with C++11 build
+        https://bugs.webkit.org/show_bug.cgi?id=111579
+
+        Reviewed by Anders Carlsson.
+
+        If the destructor is private, MemoryInstrumentation can not create an inherited class.
+
+        * css/PropertySetCSSStyleDeclaration.h:
+        (StyleRuleCSSStyleDeclaration):
+        * dom/ShadowRoot.h:
+        (ShadowRoot):
+        * loader/SubresourceLoader.h:
+        (SubresourceLoader):
+        * platform/Timer.h:
+
 2013-03-28  Allan Sandfeld Jensen  <allan.jen...@digia.com>
 
         [Qt] Create ShadowBlur on demand.

Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h (147750 => 147751)


--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h	2013-04-05 15:52:08 UTC (rev 147750)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h	2013-04-05 16:13:06 UTC (rev 147751)
@@ -90,6 +90,7 @@
     {
         return adoptRef(new StyleRuleCSSStyleDeclaration(propertySet, parentRule));
     }
+    virtual ~StyleRuleCSSStyleDeclaration();
 
     void clearParentRule() { m_parentRule = 0; }
     
@@ -102,7 +103,6 @@
 
 private:
     StyleRuleCSSStyleDeclaration(StylePropertySet*, CSSRule*);
-    virtual ~StyleRuleCSSStyleDeclaration();
 
     virtual CSSStyleSheet* parentStyleSheet() const OVERRIDE;
 

Modified: trunk/Source/WebCore/dom/ShadowRoot.h (147750 => 147751)


--- trunk/Source/WebCore/dom/ShadowRoot.h	2013-04-05 15:52:08 UTC (rev 147750)
+++ trunk/Source/WebCore/dom/ShadowRoot.h	2013-04-05 16:13:06 UTC (rev 147751)
@@ -57,6 +57,8 @@
         return adoptRef(new ShadowRoot(document, type));
     }
 
+    virtual ~ShadowRoot();
+
     void recalcStyle(StyleChange);
 
     virtual bool applyAuthorStyles() const OVERRIDE { return m_applyAuthorStyles; }
@@ -98,7 +100,6 @@
 
 private:
     ShadowRoot(Document*, ShadowRootType);
-    virtual ~ShadowRoot();
 
     virtual void dispose() OVERRIDE;
     virtual bool childTypeAllowed(NodeType) const OVERRIDE;

Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (147750 => 147751)


--- trunk/Source/WebCore/loader/SubresourceLoader.h	2013-04-05 15:52:08 UTC (rev 147750)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h	2013-04-05 16:13:06 UTC (rev 147751)
@@ -45,6 +45,8 @@
 public:
     static PassRefPtr<SubresourceLoader> create(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
 
+    virtual ~SubresourceLoader();
+
     void cancelIfNotFinishing();
     virtual bool isSubresourceLoader();
     CachedResource* cachedResource();
@@ -53,7 +55,6 @@
 
 private:
     SubresourceLoader(Frame*, CachedResource*, const ResourceLoaderOptions&);
-    virtual ~SubresourceLoader();
 
     virtual bool init(const ResourceRequest&) OVERRIDE;
 

Modified: trunk/Source/WebCore/platform/Timer.h (147750 => 147751)


--- trunk/Source/WebCore/platform/Timer.h	2013-04-05 15:52:08 UTC (rev 147750)
+++ trunk/Source/WebCore/platform/Timer.h	2013-04-05 16:13:06 UTC (rev 147751)
@@ -122,7 +122,7 @@
     return m_nextFireTime;
 }
 
-template <typename TimerFiredClass> class DeferrableOneShotTimer : private TimerBase {
+template <typename TimerFiredClass> class DeferrableOneShotTimer : protected TimerBase {
 public:
     typedef void (TimerFiredClass::*TimerFiredFunction)(DeferrableOneShotTimer*);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to