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

Side by Side Diff: Source/WebCore/bindings/v8/NPObjectWrapper.cpp

Issue 8212005: Merge 96991 - https://bugs.webkit.org/show_bug.cgi?id=69471 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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/WebCore/bindings/v8/NPObjectWrapper.h ('k') | Source/WebCore/bindings/v8/NPV8Object.cpp » ('j') | 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 return false; 154 return false;
155 155
156 if (isDefault) { 156 if (isDefault) {
157 return _NPN_InvokeDefault(0, actualObject, args, argCount, result); 157 return _NPN_InvokeDefault(0, actualObject, args, argCount, result);
158 } else { 158 } else {
159 return _NPN_Invoke(0, actualObject, name, args, argCount, result); 159 return _NPN_Invoke(0, actualObject, name, args, argCount, result);
160 } 160 }
161 } 161 }
162 162
163 } // namespace WebCore 163 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/v8/NPObjectWrapper.h ('k') | Source/WebCore/bindings/v8/NPV8Object.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698