Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "platform/Widget.h" | 27 #include "platform/Widget.h" |
| 28 | 28 |
| 29 #include "wtf/Assertions.h" | 29 #include "wtf/Assertions.h" |
| 30 #include "wtf/text/WTFString.h" | |
|
fs
2016/05/23 21:25:56
Hmm?
| |
| 30 | 31 |
| 31 namespace blink { | 32 namespace blink { |
| 32 | 33 |
| 33 Widget::Widget() | 34 Widget::Widget() |
| 34 : m_parent(nullptr) | 35 : m_parent(nullptr) |
| 35 , m_selfVisible(false) | 36 , m_selfVisible(false) |
| 36 , m_parentVisible(false) | 37 , m_parentVisible(false) |
| 37 { | 38 { |
| 38 } | 39 } |
| 39 | 40 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 59 Widget* Widget::root() const | 60 Widget* Widget::root() const |
| 60 { | 61 { |
| 61 const Widget* top = this; | 62 const Widget* top = this; |
| 62 while (top->parent()) | 63 while (top->parent()) |
| 63 top = top->parent(); | 64 top = top->parent(); |
| 64 if (top->isFrameView()) | 65 if (top->isFrameView()) |
| 65 return const_cast<Widget*>(static_cast<const Widget*>(top)); | 66 return const_cast<Widget*>(static_cast<const Widget*>(top)); |
| 66 return 0; | 67 return 0; |
| 67 } | 68 } |
| 68 | 69 |
| 70 bool Widget::resize(int w, int h) | |
| 71 { | |
| 72 return resize(IntSize(w, h)); | |
| 73 } | |
| 74 | |
| 75 bool Widget::resize(const IntSize& s) | |
| 76 { | |
| 77 IntRect newFrameRect(IntRect(location(), s)); | |
|
fs
2016/05/23 21:25:56
newFrameRect(location(), s);
Could also just comp
| |
| 78 if (newFrameRect == frameRect()) | |
| 79 return false; | |
| 80 setFrameRect(newFrameRect); | |
| 81 return true; | |
| 82 } | |
| 83 | |
| 69 IntRect Widget::convertFromRootFrame(const IntRect& rectInRootFrame) const | 84 IntRect Widget::convertFromRootFrame(const IntRect& rectInRootFrame) const |
| 70 { | 85 { |
| 71 if (const Widget* parentWidget = parent()) { | 86 if (const Widget* parentWidget = parent()) { |
| 72 IntRect parentRect = parentWidget->convertFromRootFrame(rectInRootFrame) ; | 87 IntRect parentRect = parentWidget->convertFromRootFrame(rectInRootFrame) ; |
| 73 return convertFromContainingWidget(parentRect); | 88 return convertFromContainingWidget(parentRect); |
| 74 } | 89 } |
| 75 return rectInRootFrame; | 90 return rectInRootFrame; |
| 76 } | 91 } |
| 77 | 92 |
| 78 IntRect Widget::convertToRootFrame(const IntRect& localRect) const | 93 IntRect Widget::convertToRootFrame(const IntRect& localRect) const |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 { | 177 { |
| 163 return point; | 178 return point; |
| 164 } | 179 } |
| 165 | 180 |
| 166 IntPoint Widget::convertSelfToChild(const Widget*, const IntPoint& point) const | 181 IntPoint Widget::convertSelfToChild(const Widget*, const IntPoint& point) const |
| 167 { | 182 { |
| 168 return point; | 183 return point; |
| 169 } | 184 } |
| 170 | 185 |
| 171 } // namespace blink | 186 } // namespace blink |
| OLD | NEW |