Support multiple displays for PagePopup

Source/core/page/DOMWindowPagePopup.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "config.h"
 #include "core/page/DOMWindowPagePopup.h"
 
 #include "core/frame/LocalDOMWindow.h"
 #include "core/page/PagePopupController.h"
 
 namespace blink {
 
-DOMWindowPagePopup::DOMWindowPagePopup(PagePopupClient* popupClient)
-    : m_controller(PagePopupController::create(popupClient))
+DOMWindowPagePopup::DOMWindowPagePopup(PagePopup* popup, PagePopupClient* popupClient)

[tkent, 2015/04/14 11:21:38]

Ditto.

[keishi, 2015/04/14 11:34:56]

Sorry. Done.

+    : m_controller(PagePopupController::create(popup, popupClient))
 {
     ASSERT(popupClient);
 }
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup);
 
 const char* DOMWindowPagePopup::supplementName()
 {
     return "DOMWindowPagePopup";
 }
 
 PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window)
 {
     DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&toLocalDOMWindow(window), supplementName()));
     ASSERT(supplement);
     return supplement->m_controller.get();
 }
 
-void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopupClient* popupClient)
+void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopup* popup, PagePopupClient* popupClient)

[tkent, 2015/04/14 11:21:38]

Ditto.

[keishi, 2015/04/14 11:34:56]

Done.

 {
     ASSERT(popupClient);
-    provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopup(popupClient)));
+    provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopup(popup, popupClient)));
 }
 
 void DOMWindowPagePopup::uninstall(LocalDOMWindow& window)
 {
     pagePopupController(window)->clearPagePopupClient();
     window.removeSupplement(supplementName());
 }
 
 DEFINE_TRACE(DOMWindowPagePopup)
 {
     visitor->trace(m_controller);
     WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
 }
 
 }