Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: Source/web/WebSerializedScriptValue.cpp

Issue 1116843002: v8::Isolate* should be the first parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed Mac compilation error for v8::Isolate* should be the first parameter patch Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 28 matching lines...) Expand all
39 namespace blink { 39 namespace blink {
40 40
41 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s ) 41 WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s )
42 { 42 {
43 return SerializedScriptValueFactory::instance().createFromWire(s); 43 return SerializedScriptValueFactory::instance().createFromWire(s);
44 } 44 }
45 45
46 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Local<v8::Value > value) 46 WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Local<v8::Value > value)
47 { 47 {
48 TrackExceptionState exceptionState; 48 TrackExceptionState exceptionState;
49 WebSerializedScriptValue serializedValue = SerializedScriptValueFactory::ins tance().create(value, 0, 0, exceptionState, v8::Isolate::GetCurrent()); 49 WebSerializedScriptValue serializedValue = SerializedScriptValueFactory::ins tance().create(v8::Isolate::GetCurrent(), value, 0, 0, exceptionState);
50 if (exceptionState.hadException()) 50 if (exceptionState.hadException())
51 return createInvalid(); 51 return createInvalid();
52 return serializedValue; 52 return serializedValue;
53 } 53 }
54 54
55 WebSerializedScriptValue WebSerializedScriptValue::createInvalid() 55 WebSerializedScriptValue WebSerializedScriptValue::createInvalid()
56 { 56 {
57 return SerializedScriptValueFactory::instance().create(); 57 return SerializedScriptValueFactory::instance().create();
58 } 58 }
59 59
(...skipping 27 matching lines...) Expand all
87 m_private = value; 87 m_private = value;
88 return *this; 88 return *this;
89 } 89 }
90 90
91 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const 91 WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const
92 { 92 {
93 return m_private.get(); 93 return m_private.get();
94 } 94 }
95 95
96 } // namespace blink 96 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698