diff options
author | Steve Block <steveblock@google.com> | 2010-01-20 04:45:38 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 04:45:38 -0800 |
commit | d9b562d65e56e563079a5a7778a41c98aa6cf1b5 (patch) | |
tree | 088c5e95997833029ae9bf02f28cf998242dd04e /WebCore/bridge/Bridge.h | |
parent | 0cfc2e19eeb90d6897b190b056e192bc1afd5c44 (diff) | |
parent | 032a9065415ac4791c8d73bceba10cfa9fc77bf7 (diff) | |
download | external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.zip external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.tar.gz external_webkit-d9b562d65e56e563079a5a7778a41c98aa6cf1b5.tar.bz2 |
am 032a9065: Merge "Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge" into eclair-mr2
Merge commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7' into eclair-mr2-plus-aosp
* commit '032a9065415ac4791c8d73bceba10cfa9fc77bf7':
Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/Bridge
Diffstat (limited to 'WebCore/bridge/Bridge.h')
-rw-r--r-- | WebCore/bridge/Bridge.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/WebCore/bridge/Bridge.h b/WebCore/bridge/Bridge.h index 5a743f1..71c72c3 100644 --- a/WebCore/bridge/Bridge.h +++ b/WebCore/bridge/Bridge.h @@ -20,7 +20,7 @@ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef Bridge_h @@ -58,7 +58,7 @@ public: class Method : public Noncopyable { public: virtual int numParameters() const = 0; - + virtual ~Method() { } }; @@ -85,12 +85,12 @@ public: // any needed state. void begin(); void end(); - + virtual Class* getClass() const = 0; RuntimeObjectImp* createRuntimeObject(ExecState*); void willInvalidateRuntimeObject(); void willDestroyRuntimeObject(); - + // Returns false if the value was not set successfully. virtual bool setValueOfUndefinedField(ExecState*, const Identifier&, JSValue) { return false; } @@ -98,18 +98,18 @@ public: virtual bool supportsInvokeDefaultMethod() const { return false; } virtual JSValue invokeDefaultMethod(ExecState*, const ArgList&) { return jsUndefined(); } - + virtual bool supportsConstruct() const { return false; } virtual JSValue invokeConstruct(ExecState*, const ArgList&) { return JSValue(); } - + virtual void getPropertyNames(ExecState*, PropertyNameArray&) { } virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const = 0; - + virtual JSValue valueOf(ExecState* exec) const = 0; - + RootObject* rootObject() const; - + virtual ~Instance(); virtual bool getOwnPropertySlot(JSObject*, ExecState*, const Identifier&, PropertySlot&) { return false; } @@ -121,7 +121,7 @@ protected: virtual void virtualEnd() { } virtual RuntimeObjectImp* newRuntimeObject(ExecState*); - RefPtr<RootObject> _rootObject; + RefPtr<RootObject> m_rootObject; private: RuntimeObjectImp* m_runtimeObject; @@ -131,21 +131,21 @@ class Array : public Noncopyable { public: Array(PassRefPtr<RootObject>); virtual ~Array(); - + virtual void setValueAt(ExecState*, unsigned index, JSValue) const = 0; virtual JSValue valueAt(ExecState*, unsigned index) const = 0; virtual unsigned int getLength() const = 0; protected: - RefPtr<RootObject> _rootObject; + RefPtr<RootObject> m_rootObject; }; const char* signatureForParameters(const ArgList&); typedef HashMap<RefPtr<UString::Rep>, MethodList*> MethodListMap; -typedef HashMap<RefPtr<UString::Rep>, Method*> MethodMap; -typedef HashMap<RefPtr<UString::Rep>, Field*> FieldMap; - +typedef HashMap<RefPtr<UString::Rep>, Method*> MethodMap; +typedef HashMap<RefPtr<UString::Rep>, Field*> FieldMap; + } // namespace Bindings } // namespace JSC |