Title: [101442] trunk/Source/WebKit/chromium
- Revision
- 101442
- Author
- nd...@chromium.org
- Date
- 2011-11-29 18:29:34 -0800 (Tue, 29 Nov 2011)
Log Message
Unreviewed. Fix clang build by using raw pointers instead of static OwnPtrs
for WebCompositor managment.
* src/WebCompositorImpl.cpp:
(WebKit::WebCompositorImpl::initialize):
(WebKit::WebCompositorImpl::shutdown):
* src/WebCompositorImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101441 => 101442)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-30 02:29:06 UTC (rev 101441)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-30 02:29:34 UTC (rev 101442)
@@ -1,3 +1,13 @@
+2011-11-29 Nat Duca <nd...@chromium.org>
+
+ Unreviewed. Fix clang build by using raw pointers instead of static OwnPtrs
+ for WebCompositor managment.
+
+ * src/WebCompositorImpl.cpp:
+ (WebKit::WebCompositorImpl::initialize):
+ (WebKit::WebCompositorImpl::shutdown):
+ * src/WebCompositorImpl.h:
+
2011-11-18 Nat Duca <nd...@chromium.org>
[chromium] Enable threaded compositing via CCThreadProxy::hasThread only
Modified: trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp (101441 => 101442)
--- trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp 2011-11-30 02:29:06 UTC (rev 101441)
+++ trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp 2011-11-30 02:29:34 UTC (rev 101442)
@@ -41,8 +41,8 @@
namespace WebKit {
bool WebCompositorImpl::s_initialized = false;
-OwnPtr<CCThread> WebCompositorImpl::s_mainThread;
-OwnPtr<CCThread> WebCompositorImpl::s_implThread;
+CCThread* WebCompositorImpl::s_mainThread = 0;
+CCThread* WebCompositorImpl::s_implThread = 0;
void WebCompositor::initialize(WebThread* implThread)
{
@@ -58,11 +58,11 @@
ASSERT(!s_initialized);
s_initialized = true;
- s_mainThread = CCThreadImpl::create(webKitPlatformSupport()->currentThread());
- CCProxy::setMainThread(s_mainThread.get());
+ s_mainThread = CCThreadImpl::create(webKitPlatformSupport()->currentThread()).leakPtr();
+ CCProxy::setMainThread(s_mainThread);
if (implThread) {
- s_implThread = CCThreadImpl::create(implThread);
- CCProxy::setImplThread(s_implThread.get());
+ s_implThread = CCThreadImpl::create(implThread).leakPtr();
+ CCProxy::setImplThread(s_implThread);
} else
CCProxy::setImplThread(0);
}
@@ -77,8 +77,12 @@
ASSERT(s_initialized);
ASSERT(!CCLayerTreeHost::anyLayerTreeHostInstanceExists());
- s_implThread.clear();
- s_mainThread.clear();
+ if (s_implThread) {
+ delete s_implThread;
+ s_implThread = 0;
+ }
+ delete s_mainThread;
+ s_mainThread = 0;
CCProxy::setImplThread(0);
CCProxy::setMainThread(0);
s_initialized = false;
Modified: trunk/Source/WebKit/chromium/src/WebCompositorImpl.h (101441 => 101442)
--- trunk/Source/WebKit/chromium/src/WebCompositorImpl.h 2011-11-30 02:29:06 UTC (rev 101441)
+++ trunk/Source/WebKit/chromium/src/WebCompositorImpl.h 2011-11-30 02:29:34 UTC (rev 101442)
@@ -52,8 +52,8 @@
static void shutdown();
static bool s_initialized;
- static OwnPtr<WebCore::CCThread> s_mainThread;
- static OwnPtr<WebCore::CCThread> s_implThread;
+ static WebCore::CCThread* s_mainThread;
+ static WebCore::CCThread* s_implThread;
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
