OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 { | 592 { |
593 v8::Local<v8::Object> object = m_webPlugin->v8ScriptableObject(isolate); | 593 v8::Local<v8::Object> object = m_webPlugin->v8ScriptableObject(isolate); |
594 if (!object.IsEmpty()) { | 594 if (!object.IsEmpty()) { |
595 // WebPlugin implementation can't provide the obsolete NPObject at the s
ame time: | 595 // WebPlugin implementation can't provide the obsolete NPObject at the s
ame time: |
596 ASSERT(!m_webPlugin->scriptableObject()); | 596 ASSERT(!m_webPlugin->scriptableObject()); |
597 return object; | 597 return object; |
598 } | 598 } |
599 | 599 |
600 NPObject* npObject = m_webPlugin->scriptableObject(); | 600 NPObject* npObject = m_webPlugin->scriptableObject(); |
601 if (npObject) | 601 if (npObject) |
602 return createV8ObjectForNPObject(npObject, 0, isolate); | 602 return createV8ObjectForNPObject(isolate, npObject, 0); |
603 return v8::Local<v8::Object>(); | 603 return v8::Local<v8::Object>(); |
604 } | 604 } |
605 | 605 |
606 bool WebPluginContainerImpl::getFormValue(String& value) | 606 bool WebPluginContainerImpl::getFormValue(String& value) |
607 { | 607 { |
608 WebString webValue; | 608 WebString webValue; |
609 if (m_webPlugin->getFormValue(webValue)) { | 609 if (m_webPlugin->getFormValue(webValue)) { |
610 value = webValue; | 610 value = webValue; |
611 return true; | 611 return true; |
612 } | 612 } |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
973 | 973 |
974 return clipRect; | 974 return clipRect; |
975 } | 975 } |
976 | 976 |
977 bool WebPluginContainerImpl::pluginShouldPersist() const | 977 bool WebPluginContainerImpl::pluginShouldPersist() const |
978 { | 978 { |
979 return m_webPlugin->shouldPersist(); | 979 return m_webPlugin->shouldPersist(); |
980 } | 980 } |
981 | 981 |
982 } // namespace blink | 982 } // namespace blink |
OLD | NEW |