webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebCore/bridge/c/c_runtime.h b/Source/WebCore/bridge/c/c_runtime.h
index c7f7b9ba1..219fefee4 100644
--- a/Source/WebCore/bridge/c/c_runtime.h
+++ b/Source/WebCore/bridge/c/c_runtime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2006 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -38,8 +38,8 @@ class CField : public Field {
 public:
     CField(NPIdentifier ident) : _fieldIdentifier(ident) { }
 
-    virtual JSValue valueFromInstance(ExecState*, const Instance*) const override;
-    virtual void setValueToInstance(ExecState*, const Instance*, JSValue) const override;
+    JSValue valueFromInstance(ExecState*, const Instance*) const override;
+    bool setValueToInstance(ExecState*, const Instance*, JSValue) const override;
 
     NPIdentifier identifier() const { return _fieldIdentifier; }
 
@@ -54,7 +54,7 @@ public:
     CMethod(NPIdentifier ident) : _methodIdentifier(ident) { }
 
     NPIdentifier identifier() const { return _methodIdentifier; }
-    virtual int numParameters() const override { return 0; }
+    int numParameters() const override { return 0; }
 
 private:
     NPIdentifier _methodIdentifier;