Changeset 133276 in webkit

Timestamp:

Nov 2, 2012 2:16:12 AM (11 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt][Mac][Win] Unreviewed build fix after r133182
​https://bugs.webkit.org/show_bug.cgi?id=100995

Remove two methods' OVERRIDE and virtual modifiers, because they cannot be found in any base class.
Also relocate their prototypes, because they mix with the overridden ones.

Patch by Nandor Huszka <​hnandor@inf.u-szeged.hu> on 2012-11-02

• WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:

(CoordinatedGraphicsLayer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-02  Nandor Huszka  <hnandor@inf.u-szeged.hu>
+
+        [Qt][Mac][Win] Unreviewed build fix after r133182
+        https://bugs.webkit.org/show_bug.cgi?id=100995
+
+        Remove two methods' OVERRIDE and virtual modifiers, because they cannot be found in any base class.
+        Also relocate their prototypes, because they mix with the overridden ones.
+
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h:
+        (CoordinatedGraphicsLayer):
+
 2012-11-02  Jihye Kang  <jye.kang@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.h

@@ -114 +114 @@
     virtual void setNeedsDisplayInRect(const FloatRect&) OVERRIDE;
     virtual void setContentsNeedsDisplay() OVERRIDE;
-    virtual void setContentsScale(float) OVERRIDE;
-    virtual void setVisibleContentRectTrajectoryVector(const FloatPoint&) OVERRIDE;
     virtual void flushCompositingState(const FloatRect&) OVERRIDE;
     virtual void flushCompositingStateForThisLayerOnly() OVERRIDE;
@@ -124 +122 @@
     virtual void pauseAnimation(const String&, double) OVERRIDE;
     virtual void removeAnimation(const String&) OVERRIDE;
+    
+    virtual void setContentsScale(float);
+    virtual void setVisibleContentRectTrajectoryVector(const FloatPoint&);
 
     void setRootLayer(bool);