| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2007 Apple Inc.  All rights reserved. |    2  * Copyright (C) 2007 Apple 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 |    5  * modification, are permitted provided that the following conditions | 
|    6  * are met: |    6  * are met: | 
|    7  * |    7  * | 
|    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  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of |   13  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of | 
|   14  *     its contributors may be used to endorse or promote products derived |   14  *     its contributors may be used to endorse or promote products derived | 
|   15  *     from this software without specific prior written permission. |   15  *     from this software without specific prior written permission. | 
|   16  * |   16  * | 
|   17  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |   17  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 
|   18  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |   18  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 
|   19  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |   19  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
|   20  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |   20  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 
|   21  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |   21  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 
|   22  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |   22  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 
|   23  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |   23  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 
|   24  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   24  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   25  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |   25  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 
|   26  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   26  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   27  */ |   27  */ | 
|   28  |   28  | 
|   29  |   29  | 
|   30 #include "config.h" |  | 
|   31 #include "core/frame/Screen.h" |   30 #include "core/frame/Screen.h" | 
|   32  |   31  | 
|   33 #include "core/frame/FrameHost.h" |   32 #include "core/frame/FrameHost.h" | 
|   34 #include "core/frame/FrameView.h" |   33 #include "core/frame/FrameView.h" | 
|   35 #include "core/frame/LocalFrame.h" |   34 #include "core/frame/LocalFrame.h" | 
|   36 #include "core/frame/Settings.h" |   35 #include "core/frame/Settings.h" | 
|   37 #include "core/inspector/InspectorInstrumentation.h" |   36 #include "core/inspector/InspectorInstrumentation.h" | 
|   38 #include "core/page/ChromeClient.h" |   37 #include "core/page/ChromeClient.h" | 
|   39 #include "public/platform/WebScreenInfo.h" |   38 #include "public/platform/WebScreenInfo.h" | 
|   40  |   39  | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  131     return host->chromeClient().screenInfo().availableRect.width; |  130     return host->chromeClient().screenInfo().availableRect.width; | 
|  132 } |  131 } | 
|  133  |  132  | 
|  134 DEFINE_TRACE(Screen) |  133 DEFINE_TRACE(Screen) | 
|  135 { |  134 { | 
|  136     HeapSupplementable<Screen>::trace(visitor); |  135     HeapSupplementable<Screen>::trace(visitor); | 
|  137     DOMWindowProperty::trace(visitor); |  136     DOMWindowProperty::trace(visitor); | 
|  138 } |  137 } | 
|  139  |  138  | 
|  140 } // namespace blink |  139 } // namespace blink | 
| OLD | NEW |