diff options
| author | dyen <dyen@chromium.org> | 2015-11-20 11:55:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-20 19:56:11 +0000 |
| commit | d32d4303200f2d9d016f8428546f3b30978726f3 (patch) | |
| tree | e37793a28d13f53b1cac48c337b3f20f058ded48 /third_party/WebKit/Source/platform/graphics | |
| parent | d7a71c88990b6788ceaf1ec9ee518099709ff3fd (diff) | |
| download | chromium_src-d32d4303200f2d9d016f8428546f3b30978726f3.zip chromium_src-d32d4303200f2d9d016f8428546f3b30978726f3.tar.gz chromium_src-d32d4303200f2d9d016f8428546f3b30978726f3.tar.bz2 | |
Revert of Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo. (patchset #10 id:200001 of https://codereview.chromium.org/1419913002/ )
Reason for revert:
Looks to be causing bot failures for ContextLost.WebGLContextLostInHiddenTab
Original issue's description:
> Remove blink::WebLayerClient and WebGraphicsLayerDebugInfo.
>
> It is now legal for Blink to provide an implementation of cc::LayerClient.
>
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/69698f992d3c6b2badd01f718c71df7a52b099fb
> Cr-Commit-Position: refs/heads/master@{#360855}
TBR=chrishtr@chromium.org,danakj@chromium.org,enne@chromium.org,esprehn@chromium.org,pdr@chromium.org,jbroman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1461423002
Cr-Commit-Position: refs/heads/master@{#360892}
Diffstat (limited to 'third_party/WebKit/Source/platform/graphics')
5 files changed, 80 insertions, 70 deletions
diff --git a/third_party/WebKit/Source/platform/graphics/DEPS b/third_party/WebKit/Source/platform/graphics/DEPS deleted file mode 100644 index 8d825ff..0000000 --- a/third_party/WebKit/Source/platform/graphics/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "+cc", - "-cc/blink", -] diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp index 6acf656..7a664ab 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp @@ -28,9 +28,7 @@ #include "SkImageFilter.h" #include "SkMatrix44.h" -#include "base/trace_event/trace_event_argument.h" #include "platform/DragImage.h" -#include "platform/JSONValues.h" #include "platform/TraceEvent.h" #include "platform/geometry/FloatRect.h" #include "platform/geometry/LayoutRect.h" @@ -51,13 +49,13 @@ #include "public/platform/WebFilterOperations.h" #include "public/platform/WebFloatPoint.h" #include "public/platform/WebFloatRect.h" +#include "public/platform/WebGraphicsLayerDebugInfo.h" #include "public/platform/WebLayer.h" #include "public/platform/WebPoint.h" #include "public/platform/WebSize.h" #include "wtf/CurrentTime.h" #include "wtf/HashMap.h" #include "wtf/HashSet.h" -#include "wtf/text/StringUTF8Adaptor.h" #include "wtf/text/WTFString.h" #include <algorithm> @@ -126,7 +124,7 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client) m_contentLayerDelegate = adoptPtr(new ContentLayerDelegate(this)); m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get())); m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible); - m_layer->layer()->setLayerClient(this); + m_layer->layer()->setWebLayerClient(this); // TODO(rbyers): Expose control over this to the web - crbug.com/489802: setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBlocksOnWheelEvent); @@ -456,7 +454,7 @@ void GraphicsLayer::setupContentsLayer(WebLayer* contentsLayer) m_contentsLayer = contentsLayer; m_contentsLayerId = m_contentsLayer->id(); - m_contentsLayer->setLayerClient(this); + m_contentsLayer->setWebLayerClient(this); m_contentsLayer->setTransformOrigin(FloatPoint3D()); m_contentsLayer->setUseParentBackfaceVisibility(true); @@ -487,6 +485,13 @@ GraphicsLayerDebugInfo& GraphicsLayer::debugInfo() return m_debugInfo; } +WebGraphicsLayerDebugInfo* GraphicsLayer::takeDebugInfoFor(WebLayer* layer) +{ + GraphicsLayerDebugInfo* clone = m_debugInfo.clone(); + clone->setDebugName(debugName(layer)); + return clone; +} + WebLayer* GraphicsLayer::contentsLayerIfRegistered() { clearContentsLayerIfUnregistered(); @@ -766,12 +771,7 @@ String GraphicsLayer::layerTreeAsText(LayerTreeFlags flags) const return json->toPrettyJSONString(); } -static const cc::Layer* ccLayerForWebLayer(const WebLayer* webLayer) -{ - return webLayer ? webLayer->ccLayer() : nullptr; -} - -String GraphicsLayer::debugName(cc::Layer* layer) const +String GraphicsLayer::debugName(WebLayer* webLayer) const { String name; if (!m_client) @@ -779,17 +779,17 @@ String GraphicsLayer::debugName(cc::Layer* layer) const String highlightDebugName; for (size_t i = 0; i < m_linkHighlights.size(); ++i) { - if (layer == ccLayerForWebLayer(m_linkHighlights[i]->layer())) { + if (webLayer == m_linkHighlights[i]->layer()) { highlightDebugName = "LinkHighlight[" + String::number(i) + "] for " + m_client->debugName(this); break; } } - if (layer == ccLayerForWebLayer(m_contentsLayer)) { + if (webLayer == m_contentsLayer) { name = "ContentsLayer for " + m_client->debugName(this); } else if (!highlightDebugName.isEmpty()) { name = highlightDebugName; - } else if (layer == ccLayerForWebLayer(m_layer->layer())) { + } else if (webLayer == m_layer->layer()) { name = m_client->debugName(this); } else { ASSERT_NOT_REACHED(); @@ -1143,7 +1143,7 @@ void GraphicsLayer::addLinkHighlight(LinkHighlight* linkHighlight) { ASSERT(linkHighlight && !m_linkHighlights.contains(linkHighlight)); m_linkHighlights.append(linkHighlight); - linkHighlight->layer()->setLayerClient(this); + linkHighlight->layer()->setWebLayerClient(this); updateChildList(); } @@ -1191,13 +1191,6 @@ void GraphicsLayer::didScroll() } } -scoped_refptr<base::trace_event::ConvertableToTraceFormat> GraphicsLayer::TakeDebugInfo(cc::Layer* layer) -{ - scoped_refptr<base::trace_event::TracedValue> tracedValue = m_debugInfo.asTracedValue(); - tracedValue->SetString("layer_name", WTF::StringUTF8Adaptor(debugName(layer)).asStringPiece()); - return tracedValue; -} - PaintController* GraphicsLayer::paintController() { if (!m_paintController) diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h index 3a8ef51..6e58663 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h @@ -27,7 +27,6 @@ #ifndef GraphicsLayer_h #define GraphicsLayer_h -#include "cc/layers/layer_client.h" #include "platform/PlatformExport.h" #include "platform/geometry/FloatPoint.h" #include "platform/geometry/FloatPoint3D.h" @@ -48,6 +47,7 @@ #include "public/platform/WebCompositorAnimationDelegate.h" #include "public/platform/WebContentLayer.h" #include "public/platform/WebImageLayer.h" +#include "public/platform/WebLayerClient.h" #include "public/platform/WebLayerScrollClient.h" #include "public/platform/WebScrollBlocksOn.h" #include "third_party/skia/include/core/SkPaint.h" @@ -75,7 +75,7 @@ typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector; // GraphicsLayer is an abstraction for a rendering surface with backing store, // which may have associated transformation and animations. -class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public cc::LayerClient { +class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public WebLayerClient { WTF_MAKE_NONCOPYABLE(GraphicsLayer); USING_FAST_MALLOC(GraphicsLayer); public: static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*); @@ -84,6 +84,9 @@ public: GraphicsLayerClient* client() const { return m_client; } + // WebLayerClient implementation. + WebGraphicsLayerDebugInfo* takeDebugInfoFor(WebLayer*) override; + GraphicsLayerDebugInfo& debugInfo(); void setCompositingReasons(CompositingReasons); @@ -252,9 +255,6 @@ public: // WebLayerScrollClient implementation. void didScroll() override; - // cc::LayerClient implementation. - scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(cc::Layer*) override; - PaintController* paintController() override; // Exposed for tests. @@ -267,7 +267,7 @@ public: String debugName() const { return m_client->debugName(this); } protected: - String debugName(cc::Layer*) const; + String debugName(WebLayer*) const; explicit GraphicsLayer(GraphicsLayerClient*); // GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp index 6e60f15..4c2c76e 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.cpp @@ -20,7 +20,8 @@ #include "config.h" #include "platform/graphics/GraphicsLayerDebugInfo.h" -#include "base/trace_event/trace_event_argument.h" +#include "public/platform/WebGraphicsLayerDebugInfo.h" +#include "wtf/text/CString.h" namespace blink { @@ -32,50 +33,69 @@ GraphicsLayerDebugInfo::GraphicsLayerDebugInfo() GraphicsLayerDebugInfo::~GraphicsLayerDebugInfo() { } -scoped_refptr<base::trace_event::TracedValue> GraphicsLayerDebugInfo::asTracedValue() const +void GraphicsLayerDebugInfo::appendAsTraceFormat(WebString* out) const { - scoped_refptr<base::trace_event::TracedValue> tracedValue = new base::trace_event::TracedValue; - appendAnnotatedInvalidateRects(tracedValue.get()); - appendCompositingReasons(tracedValue.get()); - appendOwnerNodeId(tracedValue.get()); - return tracedValue; + RefPtr<JSONObject> jsonObject = JSONObject::create(); + appendAnnotatedInvalidateRects(jsonObject.get()); + appendCompositingReasons(jsonObject.get()); + appendDebugName(jsonObject.get()); + appendOwnerNodeId(jsonObject.get()); + *out = jsonObject->toJSONString(); } -void GraphicsLayerDebugInfo::appendAnnotatedInvalidateRects(base::trace_event::TracedValue* tracedValue) const +GraphicsLayerDebugInfo* GraphicsLayerDebugInfo::clone() const { - tracedValue->BeginArray("annotated_invalidation_rects"); + GraphicsLayerDebugInfo* toReturn = new GraphicsLayerDebugInfo(); + toReturn->setCompositingReasons(m_compositingReasons); + toReturn->setOwnerNodeId(m_ownerNodeId); + toReturn->m_invalidations = m_invalidations; + toReturn->m_previousInvalidations = m_previousInvalidations; + return toReturn; +} + +void GraphicsLayerDebugInfo::appendAnnotatedInvalidateRects(JSONObject* jsonObject) const +{ + RefPtr<JSONArray> jsonArray = JSONArray::create(); for (const auto& annotatedRect : m_previousInvalidations) { + RefPtr<JSONObject> rectContainer = JSONObject::create(); + RefPtr<JSONArray> rectArray = JSONArray::create(); const FloatRect& rect = annotatedRect.rect; - tracedValue->BeginDictionary(); - tracedValue->BeginArray("geometry_rect"); - tracedValue->AppendDouble(rect.x()); - tracedValue->AppendDouble(rect.y()); - tracedValue->AppendDouble(rect.width()); - tracedValue->AppendDouble(rect.height()); - tracedValue->EndArray(); - tracedValue->SetString("reason", paintInvalidationReasonToString(annotatedRect.reason)); - tracedValue->EndDictionary(); + rectArray->pushNumber(rect.x()); + rectArray->pushNumber(rect.y()); + rectArray->pushNumber(rect.width()); + rectArray->pushNumber(rect.height()); + rectContainer->setArray("geometry_rect", rectArray); + rectContainer->setString("reason", paintInvalidationReasonToString(annotatedRect.reason)); + jsonArray->pushObject(rectContainer); } - tracedValue->EndArray(); + jsonObject->setArray("annotated_invalidation_rects", jsonArray); } -void GraphicsLayerDebugInfo::appendCompositingReasons(base::trace_event::TracedValue* tracedValue) const +void GraphicsLayerDebugInfo::appendCompositingReasons(JSONObject* jsonObject) const { - tracedValue->BeginArray("compositing_reasons"); + RefPtr<JSONArray> jsonArray = JSONArray::create(); for (size_t i = 0; i < kNumberOfCompositingReasons; ++i) { if (!(m_compositingReasons & kCompositingReasonStringMap[i].reason)) continue; - tracedValue->AppendString(kCompositingReasonStringMap[i].description); + jsonArray->pushString(kCompositingReasonStringMap[i].description); } - tracedValue->EndArray(); + jsonObject->setArray("compositing_reasons", jsonArray); +} + +void GraphicsLayerDebugInfo::appendDebugName(JSONObject* jsonObject) const +{ + if (m_debugName.isEmpty()) + return; + + jsonObject->setString("layer_name", m_debugName); } -void GraphicsLayerDebugInfo::appendOwnerNodeId(base::trace_event::TracedValue* tracedValue) const +void GraphicsLayerDebugInfo::appendOwnerNodeId(JSONObject* jsonObject) const { if (!m_ownerNodeId) return; - tracedValue->SetInteger("owner_node", m_ownerNodeId); + jsonObject->setNumber("owner_node", m_ownerNodeId); } void GraphicsLayerDebugInfo::appendAnnotatedInvalidateRect(const FloatRect& rect, PaintInvalidationReason invalidationReason) diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h index b5ebc2c..be57a28 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h @@ -31,27 +31,26 @@ #ifndef GraphicsLayerDebugInfo_h #define GraphicsLayerDebugInfo_h -#include "base/memory/ref_counted.h" +#include "platform/JSONValues.h" #include "platform/geometry/FloatRect.h" #include "platform/graphics/CompositingReasons.h" #include "platform/graphics/PaintInvalidationReason.h" -#include "wtf/Vector.h" +#include "public/platform/WebGraphicsLayerDebugInfo.h" -namespace base { -namespace trace_event { -class TracedValue; -} -} +#include "wtf/Vector.h" namespace blink { -class GraphicsLayerDebugInfo { +class GraphicsLayerDebugInfo final : public WebGraphicsLayerDebugInfo { public: GraphicsLayerDebugInfo(); - ~GraphicsLayerDebugInfo(); + ~GraphicsLayerDebugInfo() override; + + void appendAsTraceFormat(WebString* out) const override; - scoped_refptr<base::trace_event::TracedValue> asTracedValue() const; + GraphicsLayerDebugInfo* clone() const; + void setDebugName(const String& name) { m_debugName = name; } CompositingReasons compositingReasons() const { return m_compositingReasons; } void setCompositingReasons(CompositingReasons reasons) { m_compositingReasons = reasons; } void setOwnerNodeId(int id) { m_ownerNodeId = id; } @@ -60,15 +59,17 @@ public: void clearAnnotatedInvalidateRects(); private: - void appendAnnotatedInvalidateRects(base::trace_event::TracedValue*) const; - void appendCompositingReasons(base::trace_event::TracedValue*) const; - void appendOwnerNodeId(base::trace_event::TracedValue*) const; + void appendAnnotatedInvalidateRects(JSONObject*) const; + void appendCompositingReasons(JSONObject*) const; + void appendDebugName(JSONObject*) const; + void appendOwnerNodeId(JSONObject*) const; struct AnnotatedInvalidationRect { FloatRect rect; PaintInvalidationReason reason; }; + String m_debugName; CompositingReasons m_compositingReasons; int m_ownerNodeId; Vector<AnnotatedInvalidationRect> m_invalidations; |