OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 | 592 |
593 static std::unique_ptr<WebGraphicsContext3DProvider> | 593 static std::unique_ptr<WebGraphicsContext3DProvider> |
594 createContextProviderOnWorkerThread( | 594 createContextProviderOnWorkerThread( |
595 Platform::ContextAttributes contextAttributes, | 595 Platform::ContextAttributes contextAttributes, |
596 Platform::GraphicsInfo* glInfo, | 596 Platform::GraphicsInfo* glInfo, |
597 const KURL& url) { | 597 const KURL& url) { |
598 WaitableEvent waitableEvent; | 598 WaitableEvent waitableEvent; |
599 ContextProviderCreationInfo creationInfo; | 599 ContextProviderCreationInfo creationInfo; |
600 creationInfo.contextAttributes = contextAttributes; | 600 creationInfo.contextAttributes = contextAttributes; |
601 creationInfo.glInfo = glInfo; | 601 creationInfo.glInfo = glInfo; |
602 creationInfo.url = url; | 602 creationInfo.url = url.copy(); |
603 RefPtr<WebTaskRunner> taskRunner = | 603 RefPtr<WebTaskRunner> taskRunner = |
604 Platform::current()->mainThread()->getWebTaskRunner(); | 604 Platform::current()->mainThread()->getWebTaskRunner(); |
605 taskRunner->postTask(BLINK_FROM_HERE, | 605 taskRunner->postTask(BLINK_FROM_HERE, |
606 crossThreadBind(&createContextProviderOnMainThread, | 606 crossThreadBind(&createContextProviderOnMainThread, |
607 crossThreadUnretained(&creationInfo), | 607 crossThreadUnretained(&creationInfo), |
608 crossThreadUnretained(&waitableEvent))); | 608 crossThreadUnretained(&waitableEvent))); |
609 waitableEvent.wait(); | 609 waitableEvent.wait(); |
610 return std::move(creationInfo.createdContextProvider); | 610 return std::move(creationInfo.createdContextProvider); |
611 } | 611 } |
612 | 612 |
(...skipping 7196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7809 | 7809 |
7810 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( | 7810 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( |
7811 HTMLCanvasElementOrOffscreenCanvas& result) const { | 7811 HTMLCanvasElementOrOffscreenCanvas& result) const { |
7812 if (canvas()) | 7812 if (canvas()) |
7813 result.setHTMLCanvasElement(canvas()); | 7813 result.setHTMLCanvasElement(canvas()); |
7814 else | 7814 else |
7815 result.setOffscreenCanvas(offscreenCanvas()); | 7815 result.setOffscreenCanvas(offscreenCanvas()); |
7816 } | 7816 } |
7817 | 7817 |
7818 } // namespace blink | 7818 } // namespace blink |
OLD | NEW |