| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 { | 85 { |
| 86 return IntRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInS
creen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.heig
ht); | 86 return IntRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInS
creen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.heig
ht); |
| 87 } | 87 } |
| 88 | 88 |
| 89 virtual void setWindowRect(const IntRect& rect) override | 89 virtual void setWindowRect(const IntRect& rect) override |
| 90 { | 90 { |
| 91 m_popup->m_windowRectInScreen = rect; | 91 m_popup->m_windowRectInScreen = rect; |
| 92 m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen); | 92 m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen); |
| 93 } | 93 } |
| 94 | 94 |
| 95 virtual IntRect rootViewToScreen(const IntRect& rect) const override | 95 virtual IntRect viewportToScreen(const IntRect& rect) const override |
| 96 { | 96 { |
| 97 IntRect rectInScreen(rect); | 97 IntRect rectInScreen(rect); |
| 98 rectInScreen.move(m_popup->m_windowRectInScreen.x, m_popup->m_windowRect
InScreen.y); | 98 rectInScreen.move(m_popup->m_windowRectInScreen.x, m_popup->m_windowRect
InScreen.y); |
| 99 return rectInScreen; | 99 return rectInScreen; |
| 100 } | 100 } |
| 101 | 101 |
| 102 virtual void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, c
onst String& message, unsigned lineNumber, const String&, const String&) overrid
e | 102 virtual void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, c
onst String& message, unsigned lineNumber, const String&, const String&) overrid
e |
| 103 { | 103 { |
| 104 #ifndef NDEBUG | 104 #ifndef NDEBUG |
| 105 fprintf(stderr, "CONSOLE MESSSAGE:%u: %s\n", lineNumber, message.utf8().
data()); | 105 fprintf(stderr, "CONSOLE MESSSAGE:%u: %s\n", lineNumber, message.utf8().
data()); |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 , m_isAcceleratedCompositingActive(false) | 205 , m_isAcceleratedCompositingActive(false) |
| 206 { | 206 { |
| 207 ASSERT(client); | 207 ASSERT(client); |
| 208 } | 208 } |
| 209 | 209 |
| 210 WebPagePopupImpl::~WebPagePopupImpl() | 210 WebPagePopupImpl::~WebPagePopupImpl() |
| 211 { | 211 { |
| 212 ASSERT(!m_page); | 212 ASSERT(!m_page); |
| 213 } | 213 } |
| 214 | 214 |
| 215 bool WebPagePopupImpl::initialize(WebViewImpl* webView, PagePopupClient* popupCl
ient, const IntRect&) | 215 bool WebPagePopupImpl::initialize(WebViewImpl* webView, PagePopupClient* popupCl
ient) |
| 216 { | 216 { |
| 217 ASSERT(webView); | 217 ASSERT(webView); |
| 218 ASSERT(popupClient); | 218 ASSERT(popupClient); |
| 219 m_webView = webView; | 219 m_webView = webView; |
| 220 m_popupClient = popupClient; | 220 m_popupClient = popupClient; |
| 221 | 221 |
| 222 resize(m_popupClient->contentSize()); | 222 resize(m_popupClient->contentSize()); |
| 223 | 223 |
| 224 if (!m_widgetClient || !initializePage()) | 224 if (!m_widgetClient || !initializePage()) |
| 225 return false; | 225 return false; |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 // A WebPagePopupImpl instance usually has two references. | 485 // A WebPagePopupImpl instance usually has two references. |
| 486 // - One owned by the instance itself. It represents the visible widget. | 486 // - One owned by the instance itself. It represents the visible widget. |
| 487 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 487 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 488 // WebPagePopupImpl to close. | 488 // WebPagePopupImpl to close. |
| 489 // We need them because the closing operation is asynchronous and the widget | 489 // We need them because the closing operation is asynchronous and the widget |
| 490 // can be closed while the WebViewImpl is unaware of it. | 490 // can be closed while the WebViewImpl is unaware of it. |
| 491 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 491 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 492 } | 492 } |
| 493 | 493 |
| 494 } // namespace blink | 494 } // namespace blink |
| OLD | NEW |