Roll dom_distiller_js

components/dom_distiller/core/distiller_page.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/dom_distiller/core/distiller_page.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 55 matching lines @@
   ready_ = false;
   distiller_page_callback_ = callback;
   DistillPageImpl(gurl, GetDistillerScriptWithOptions(options));
 }
 
 void DistillerPage::OnDistillationDone(const GURL& page_url,
                                        const base::Value* value) {
   DCHECK(!ready_);
   ready_ = true;
 
-  scoped_ptr<dom_distiller::proto::DomDistillerResult> distiller_result;
-
+  scoped_ptr<dom_distiller::proto::DomDistillerResult> distiller_result(
+      new dom_distiller::proto::DomDistillerResult());
   bool found_content;
   if (value->IsType(base::Value::TYPE_NULL)) {
     found_content = false;
   } else {
-    found_content = true;
-    distiller_result.reset(new dom_distiller::proto::DomDistillerResult(
-        dom_distiller::proto::json::DomDistillerResult::ReadFromValue(value)));
-    if (distiller_result->has_timing_info()) {
+    found_content =
+        dom_distiller::proto::json::DomDistillerResult::ReadFromValue(
+            value, distiller_result.get());
+    if (!found_content) {
+      DVLOG(1) << "Unable to parse DomDistillerResult.";
+    } else if (distiller_result->has_timing_info()) {
       const dom_distiller::proto::TimingInfo& timing =
           distiller_result->timing_info();
       if (timing.has_markup_parsing_time()) {
         UMA_HISTOGRAM_TIMES(
             "DomDistiller.Time.MarkupParsing",
             base::TimeDelta::FromMillisecondsD(timing.markup_parsing_time()));
       }
       if (timing.has_document_construction_time()) {
         UMA_HISTOGRAM_TIMES(
             "DomDistiller.Time.DocumentConstruction",
@@ skipping 20 matching lines @@
   }
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(distiller_page_callback_,
                  base::Passed(&distiller_result),
                  found_content));
 }
 
 }  // namespace dom_distiller