Index: third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp |
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp b/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp |
index 584ef4cabfba599b3b43f8b79d2f1230fd50a579..6393482b49999f5d941373e14caa996d1409a731 100644 |
--- a/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp |
+++ b/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp |
@@ -18,8 +18,9 @@ namespace blink { |
namespace { |
WebPresentationClient* presentationClient(ExecutionContext* executionContext) { |
- ASSERT(executionContext && executionContext->isDocument()); |
- |
+ if (!executionContext) |
dcheng
2016/10/05 00:10:27
Is this because we can be asked to provide a prese
haraken
2016/10/05 02:38:24
You're correct.
We didn't hit this branch before
|
+ return nullptr; |
+ DCHECK(executionContext->isDocument()); |
Document* document = toDocument(executionContext); |
if (!document->frame()) |
return nullptr; |
@@ -94,7 +95,7 @@ void PresentationAvailability::suspend() { |
setState(State::Suspended); |
} |
-void PresentationAvailability::stop() { |
+void PresentationAvailability::contextDestroyed() { |
setState(State::Inactive); |
} |