Move FrameHost::m_consoleMessageStorage to Page

Move FrameHost::m_consoleMessageStorage to Page

Move the field FrameHost::m_consoleMessageStorage to Page, and update
FrameHost methods to directly call the equivalent Page method.

BUG=691794
Review-Url: https://codereview.chromium.org/2738703003
Cr-Commit-Position: refs/heads/master@{#456984}
Committed: https://chromium.googlesource.com/chromium/src/+/d9ae71b54435ce738e3e7d3717a42183bbea811c

[sashab, 2017-03-08 03:48:23]

The CQ bit was checked by sashab@chromium.org to run a CQ dry run

[sashab, 2017-03-08 03:48:49]

sashab@chromium.org changed reviewers:
+ slangley@chromium.org

[commit-bot: I haz the power, 2017-03-08 03:48:58]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-08 04:14:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-08 04:14:31]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[haraken, 2017-03-08 06:05:52]

LGTM

[sashab, 2017-03-09 04:00:10]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-09 04:00:10]

The patchset sent to the CQ was uploaded after l-g-t-m from haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps20001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-09 04:00:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-09 04:19:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 04:19:12]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[slangley, 2017-03-09 04:20:56]

slangley@chromium.org changed reviewers:
+ haraken@chromium.org

[slangley, 2017-03-09 04:20:56]

lgtm

[sashab, 2017-03-10 01:58:57]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-10 01:58:57]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps40001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-10 01:59:39]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-10 02:07:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-10 02:07:08]

Try jobs failed on following builders:
  cast_shell_android on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)
  cast_shell_linux on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linu...)
  linux_chromium_tsan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[sashab, 2017-03-10 02:20:54]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-10 02:20:54]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps60001
(title: "Fixed bad rebase")

[commit-bot: I haz the power, 2017-03-10 02:21:49]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-10 04:24:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-10 04:24:51]

Failed to apply patch for third_party/WebKit/Source/core/frame/FrameHost.cpp:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/Source/core/frame/FrameHost.cpp:51
  error: third_party/WebKit/Source/core/frame/FrameHost.cpp: patch does not
apply

Patch:       third_party/WebKit/Source/core/frame/FrameHost.cpp
Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp
b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index
ce9e70d2ad73f93b8c3a3f1146cca890ecf52cf7..1b3af4074c6187ae47a1ed4800f2fdc36c22a698
100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -32,7 +32,6 @@
 
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
-#include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
@@ -51,7 +50,6 @@ FrameHost::FrameHost(Page& page)
       m_overscrollController(
           OverscrollController::create(*m_visualViewport,
                                        m_page->chromeClient())),
-      m_consoleMessageStorage(new ConsoleMessageStorage()),
       m_globalRootScrollerController(
           TopDocumentRootScrollerController::create(*this)),
       m_subframeCount(0) {}
@@ -100,11 +98,11 @@ const EventHandlerRegistry&
FrameHost::eventHandlerRegistry() const {
 }
 
 ConsoleMessageStorage& FrameHost::consoleMessageStorage() {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
@@ -116,7 +114,6 @@ DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
   visitor->trace(m_visualViewport);
   visitor->trace(m_overscrollController);
-  visitor->trace(m_consoleMessageStorage);
   visitor->trace(m_globalRootScrollerController);
 }

[sashab, 2017-03-13 03:40:31]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-13 03:40:31]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps80001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-13 03:40:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-13 05:35:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-13 05:35:19]

Failed to apply patch for third_party/WebKit/Source/core/frame/FrameHost.cpp:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/Source/core/frame/FrameHost.cpp:32
  error: third_party/WebKit/Source/core/frame/FrameHost.cpp: patch does not
apply

Patch:       third_party/WebKit/Source/core/frame/FrameHost.cpp
Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp
b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index
e7ffb9b2a3e5b2da1bf7b3f0dbb239e8290e99fe..070f1cf4559b5faacf398364a4ef7c48d1c728c8
100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -32,7 +32,6 @@
 
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
-#include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
@@ -51,7 +50,6 @@ FrameHost::FrameHost(Page& page)
       m_overscrollController(
           OverscrollController::create(*m_visualViewport,
                                        m_page->chromeClient())),
-      m_consoleMessageStorage(new ConsoleMessageStorage()),
       m_globalRootScrollerController(
           TopDocumentRootScrollerController::create(page)),
       m_subframeCount(0) {}
@@ -92,11 +90,11 @@ const VisualViewport& FrameHost::visualViewport() const {
 }
 
 ConsoleMessageStorage& FrameHost::consoleMessageStorage() {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
@@ -108,7 +106,6 @@ DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
   visitor->trace(m_visualViewport);
   visitor->trace(m_overscrollController);
-  visitor->trace(m_consoleMessageStorage);
   visitor->trace(m_globalRootScrollerController);
 }

[sashab, 2017-03-14 00:37:15]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-14 00:37:16]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps100001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-14 00:37:42]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-14 00:52:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-14 00:52:24]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[sashab, 2017-03-14 04:26:25]

The CQ bit was checked by sashab@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-14 04:26:46]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-14 04:28:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-14 04:28:38]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[sashab, 2017-03-14 05:13:49]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-14 05:13:49]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps140001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-14 05:14:09]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-14 06:33:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-14 06:33:29]

Failed to apply patch for third_party/WebKit/Source/core/frame/FrameHost.cpp:
While running git apply --index -p1;
  error: patch failed: third_party/WebKit/Source/core/frame/FrameHost.cpp:79
  error: third_party/WebKit/Source/core/frame/FrameHost.cpp: patch does not
apply

Patch:       third_party/WebKit/Source/core/frame/FrameHost.cpp
Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp
b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index
f998cf116a6901cc8e2b3f8b36400de3f638d7ad..f6e069d80826a7a4e728556611e648a0bdbd62f5
100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -31,7 +31,6 @@
 #include "core/frame/FrameHost.h"
 
 #include "core/frame/FrameView.h"
-#include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "public/platform/Platform.h"
@@ -48,7 +47,6 @@ FrameHost::FrameHost(Page& page)
       m_overscrollController(
           OverscrollController::create(m_page->visualViewport(),
                                        m_page->chromeClient())),
-      m_consoleMessageStorage(new ConsoleMessageStorage()),
       m_subframeCount(0) {}
 
 // Explicitly in the .cpp to avoid default constructor in .h
@@ -79,11 +77,11 @@ const OverscrollController&
FrameHost::overscrollController() const {
 }
 
 ConsoleMessageStorage& FrameHost::consoleMessageStorage() {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
-  return *m_consoleMessageStorage;
+  return page().consoleMessageStorage();
 }
 
 TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
@@ -94,7 +92,6 @@ TopDocumentRootScrollerController&
FrameHost::globalRootScrollerController()
 DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
   visitor->trace(m_overscrollController);
-  visitor->trace(m_consoleMessageStorage);
 }
 
 #if DCHECK_IS_ON()

[sashab, 2017-03-15 02:26:19]

The CQ bit was checked by sashab@chromium.org

[sashab, 2017-03-15 02:26:19]

The patchset sent to the CQ was uploaded after l-g-t-m from
slangley@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/2738703003/#ps160001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-15 02:26:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-15 03:53:05]

CQ is committing da patch.

Bot data: {"patchset_id": 160001, "attempt_start_ts": 1489544779103380,
"parent_rev": "17a0101f47569f80a539f7379b739134897f4842", "commit_rev":
"d9ae71b54435ce738e3e7d3717a42183bbea811c"}

[commit-bot: I haz the power, 2017-03-15 03:53:47]

Description was changed from

==========
Move FrameHost::m_consoleMessageStorage to Page

Move the field FrameHost::m_consoleMessageStorage to Page, and update
FrameHost methods to directly call the equivalent Page method.

BUG=691794
==========

to

==========
Move FrameHost::m_consoleMessageStorage to Page

Move the field FrameHost::m_consoleMessageStorage to Page, and update
FrameHost methods to directly call the equivalent Page method.

BUG=691794

Review-Url: https://codereview.chromium.org/2738703003
Cr-Commit-Position: refs/heads/master@{#456984}
Committed:
https://chromium.googlesource.com/chromium/src/+/d9ae71b54435ce738e3e7d3717a4...
==========

[commit-bot: I haz the power, 2017-03-15 03:53:48]

Committed patchset #9 (id:160001) as
https://chromium.googlesource.com/chromium/src/+/d9ae71b54435ce738e3e7d3717a4...