Attachment #240722 for bug #138238

View Details Raw Unified Return to Bug 138238



2014-10-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Use std::unique_ptr instead of OwnPtr in CoordinatorDrawingProxy
        https://bugs.webkit.org/show_bug.cgi?id=138238

        Reviewed by NOBODY (OOPS!).

        * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
        (WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy): Use std::make_unique.
        (WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
        * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h: Use std::unique_ptr instead of OwnPtr.

2014-10-30  Jer Noble  <jer.noble@apple.com>

        [EME] Add Setting for accessing storage location for MediaKeys data



{
    // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
    if (webPageProxy.pageGroup().preferences().forceCompositingMode())
        m_coordinatedLayerTreeHostProxy = std::make_unique<CoordinatedLayerTreeHostProxy>(this);
}

CoordinatedDrawingAreaProxy::~CoordinatedDrawingAreaProxy()

    m_layerTreeContext = layerTreeContext;
    m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
    if (!m_coordinatedLayerTreeHostProxy)
        m_coordinatedLayerTreeHostProxy = std::make_unique<CoordinatedLayerTreeHostProxy>(this);
}

void CoordinatedDrawingAreaProxy::setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, const WebCore::FloatPoint& trajectoryVector)



#include "BackingStore.h"
#include "DrawingAreaProxy.h"
#include "LayerTreeContext.h"
#include <wtf/OwnPtr.h>
#include <wtf/RunLoop.h>

namespace WebCore {

    void discardBackingStoreSoon();
    void discardBackingStore();

    std::unique_ptr<CoordinatedLayerTreeHostProxy> m_coordinatedLayerTreeHostProxy;

    // The state ID corresponding to our current backing store. Updated whenever we allocate
    // a new backing store. Any messages received that correspond to an earlier state are ignored,

Return to Bug 138238

Lines 55-61 CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy& webPagePr a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp_sec1
- a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp -2 / +2 lines
55	{	55	{
56	// Construct the proxy early to allow messages to be sent to the web process while AC is entered there.	56	// Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
57	if (webPageProxy.pageGroup().preferences().forceCompositingMode())	57	if (webPageProxy.pageGroup().preferences().forceCompositingMode())
58	m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));	58	m_coordinatedLayerTreeHostProxy = std::make_unique<CoordinatedLayerTreeHostProxy>(this);
59	}	59	}
60		60
61	CoordinatedDrawingAreaProxy::~CoordinatedDrawingAreaProxy()	61	CoordinatedDrawingAreaProxy::~CoordinatedDrawingAreaProxy()
Lines 324-330 void CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode(const LayerTre a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp_sec2
324	m_layerTreeContext = layerTreeContext;	324	m_layerTreeContext = layerTreeContext;
325	m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);	325	m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
326	if (!m_coordinatedLayerTreeHostProxy)	326	if (!m_coordinatedLayerTreeHostProxy)
327	m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));	327	m_coordinatedLayerTreeHostProxy = std::make_unique<CoordinatedLayerTreeHostProxy>(this);
328	}	328	}
329		329
330	void CoordinatedDrawingAreaProxy::setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, const WebCore::FloatPoint& trajectoryVector)	330	void CoordinatedDrawingAreaProxy::setVisibleContentsRect(const WebCore::FloatRect& visibleContentsRect, const WebCore::FloatPoint& trajectoryVector)

Lines 32-38 a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h_sec1
- a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h -2 / +1 lines
32	#include "BackingStore.h"	32	#include "BackingStore.h"
33	#include "DrawingAreaProxy.h"	33	#include "DrawingAreaProxy.h"
34	#include "LayerTreeContext.h"	34	#include "LayerTreeContext.h"
35	#include <wtf/OwnPtr.h>
36	#include <wtf/RunLoop.h>	35	#include <wtf/RunLoop.h>
37		36
38	namespace WebCore {	37	namespace WebCore {
Lines 93-99 private: a/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h_sec2
93	void discardBackingStoreSoon();	92	void discardBackingStoreSoon();
94	void discardBackingStore();	93	void discardBackingStore();
95		94
96	OwnPtr<CoordinatedLayerTreeHostProxy> m_coordinatedLayerTreeHostProxy;	95	std::unique_ptr<CoordinatedLayerTreeHostProxy> m_coordinatedLayerTreeHostProxy;
97		96
98	// The state ID corresponding to our current backing store. Updated whenever we allocate	97	// The state ID corresponding to our current backing store. Updated whenever we allocate
99	// a new backing store. Any messages received that correspond to an earlier state are ignored,	98	// a new backing store. Any messages received that correspond to an earlier state are ignored,

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +12 lines
		1	2014-10-30 Gyuyoung Kim <gyuyoung.kim@samsung.com>
		2
		3	Use std::unique_ptr instead of OwnPtr in CoordinatorDrawingProxy
		4	https://bugs.webkit.org/show_bug.cgi?id=138238
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
		9	(WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy): Use std::make_unique.
		10	(WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
		11	* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h: Use std::unique_ptr instead of OwnPtr.
		12
1	2014-10-30 Jer Noble <jer.noble@apple.com>	13	2014-10-30 Jer Noble <jer.noble@apple.com>
2		14
3	[EME] Add Setting for accessing storage location for MediaKeys data	15	[EME] Add Setting for accessing storage location for MediaKeys data