| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "core/editing/markers/DocumentMarkerController.h" | 44 #include "core/editing/markers/DocumentMarkerController.h" |
| 45 #include "core/events/ErrorEvent.h" | 45 #include "core/events/ErrorEvent.h" |
| 46 #include "core/fetch/ResourceFetcher.h" | 46 #include "core/fetch/ResourceFetcher.h" |
| 47 #include "core/frame/BrowserControls.h" | 47 #include "core/frame/BrowserControls.h" |
| 48 #include "core/frame/EventHandlerRegistry.h" | 48 #include "core/frame/EventHandlerRegistry.h" |
| 49 #include "core/frame/FrameHost.h" | 49 #include "core/frame/FrameHost.h" |
| 50 #include "core/frame/LocalFrame.h" | 50 #include "core/frame/LocalFrame.h" |
| 51 #include "core/frame/Location.h" | 51 #include "core/frame/Location.h" |
| 52 #include "core/frame/PageScaleConstraintsSet.h" | 52 #include "core/frame/PageScaleConstraintsSet.h" |
| 53 #include "core/frame/PerformanceMonitor.h" | 53 #include "core/frame/PerformanceMonitor.h" |
| 54 #include "core/frame/RemoteFrame.h" |
| 55 #include "core/frame/RemoteFrameView.h" |
| 54 #include "core/frame/Settings.h" | 56 #include "core/frame/Settings.h" |
| 55 #include "core/frame/VisualViewport.h" | 57 #include "core/frame/VisualViewport.h" |
| 56 #include "core/html/HTMLFrameElement.h" | 58 #include "core/html/HTMLFrameElement.h" |
| 57 #include "core/html/HTMLPlugInElement.h" | 59 #include "core/html/HTMLPlugInElement.h" |
| 58 #include "core/html/HTMLTextFormControlElement.h" | 60 #include "core/html/HTMLTextFormControlElement.h" |
| 59 #include "core/html/parser/TextResourceDecoder.h" | 61 #include "core/html/parser/TextResourceDecoder.h" |
| 60 #include "core/input/EventHandler.h" | 62 #include "core/input/EventHandler.h" |
| 61 #include "core/inspector/InspectorInstrumentation.h" | 63 #include "core/inspector/InspectorInstrumentation.h" |
| 62 #include "core/inspector/InspectorTraceEvents.h" | 64 #include "core/inspector/InspectorTraceEvents.h" |
| 63 #include "core/layout/LayoutAnalyzer.h" | 65 #include "core/layout/LayoutAnalyzer.h" |
| (...skipping 4513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4577 int FrameView::initialViewportWidth() const { | 4579 int FrameView::initialViewportWidth() const { |
| 4578 DCHECK(m_frame->isMainFrame()); | 4580 DCHECK(m_frame->isMainFrame()); |
| 4579 return m_initialViewportSize.width(); | 4581 return m_initialViewportSize.width(); |
| 4580 } | 4582 } |
| 4581 | 4583 |
| 4582 int FrameView::initialViewportHeight() const { | 4584 int FrameView::initialViewportHeight() const { |
| 4583 DCHECK(m_frame->isMainFrame()); | 4585 DCHECK(m_frame->isMainFrame()); |
| 4584 return m_initialViewportSize.height(); | 4586 return m_initialViewportSize.height(); |
| 4585 } | 4587 } |
| 4586 | 4588 |
| 4589 void FrameView::setViewportIntersectionFromParent( |
| 4590 const IntRect& viewportIntersection) { |
| 4591 m_remoteViewportIntersection = viewportIntersection; |
| 4592 updateAllLifecyclePhases(); |
| 4593 } |
| 4594 |
| 4595 IntRect FrameView::remoteViewportIntersection() { |
| 4596 IntRect intersection(m_remoteViewportIntersection); |
| 4597 intersection.move(scrollOffsetInt()); |
| 4598 return intersection; |
| 4599 } |
| 4600 |
| 4587 } // namespace blink | 4601 } // namespace blink |
| OLD | NEW |