| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "core/editing/TextIterator.h" | 44 #include "core/editing/TextIterator.h" |
| 45 #include "core/editing/markup.h" | 45 #include "core/editing/markup.h" |
| 46 #include "core/events/KeyboardEvent.h" | 46 #include "core/events/KeyboardEvent.h" |
| 47 #include "core/events/WheelEvent.h" | 47 #include "core/events/WheelEvent.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/FrameView.h" | 50 #include "core/frame/FrameView.h" |
| 51 #include "core/frame/LocalFrame.h" | 51 #include "core/frame/LocalFrame.h" |
| 52 #include "core/frame/Settings.h" | 52 #include "core/frame/Settings.h" |
| 53 #include "core/html/HTMLImportElement.h" | 53 #include "core/html/HTMLImportElement.h" |
| 54 #include "core/html/HTMLMediaElement.h" | |
| 55 #include "core/html/ime/InputMethodContext.h" | 54 #include "core/html/ime/InputMethodContext.h" |
| 56 #include "core/loader/FrameLoader.h" | 55 #include "core/loader/FrameLoader.h" |
| 57 #include "core/loader/UniqueIdentifier.h" | 56 #include "core/loader/UniqueIdentifier.h" |
| 58 #include "core/page/Chrome.h" | 57 #include "core/page/Chrome.h" |
| 59 #include "core/page/EventHandler.h" | 58 #include "core/page/EventHandler.h" |
| 60 #include "core/page/EventWithHitTestResults.h" | 59 #include "core/page/EventWithHitTestResults.h" |
| 61 #include "core/page/FocusController.h" | 60 #include "core/page/FocusController.h" |
| 62 #include "core/page/Page.h" | 61 #include "core/page/Page.h" |
| 63 #include "core/page/TouchDisambiguation.h" | 62 #include "core/page/TouchDisambiguation.h" |
| 64 #include "core/rendering/RenderView.h" | 63 #include "core/rendering/RenderView.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 85 #include "public/platform/WebFloatPoint.h" | 84 #include "public/platform/WebFloatPoint.h" |
| 86 #include "public/platform/WebGestureCurve.h" | 85 #include "public/platform/WebGestureCurve.h" |
| 87 #include "public/platform/WebImage.h" | 86 #include "public/platform/WebImage.h" |
| 88 #include "public/platform/WebLayerTreeView.h" | 87 #include "public/platform/WebLayerTreeView.h" |
| 89 #include "public/platform/WebURLRequest.h" | 88 #include "public/platform/WebURLRequest.h" |
| 90 #include "public/platform/WebVector.h" | 89 #include "public/platform/WebVector.h" |
| 91 #include "public/web/WebActiveWheelFlingParameters.h" | 90 #include "public/web/WebActiveWheelFlingParameters.h" |
| 92 #include "public/web/WebBeginFrameArgs.h" | 91 #include "public/web/WebBeginFrameArgs.h" |
| 93 #include "public/web/WebFrameClient.h" | 92 #include "public/web/WebFrameClient.h" |
| 94 #include "public/web/WebHitTestResult.h" | 93 #include "public/web/WebHitTestResult.h" |
| 95 #include "public/web/WebMediaPlayerAction.h" | |
| 96 #include "public/web/WebNode.h" | 94 #include "public/web/WebNode.h" |
| 97 #include "public/web/WebRange.h" | 95 #include "public/web/WebRange.h" |
| 98 #include "public/web/WebTextInputInfo.h" | 96 #include "public/web/WebTextInputInfo.h" |
| 99 #include "public/web/WebViewClient.h" | 97 #include "public/web/WebViewClient.h" |
| 100 #include "web/CompositionUnderlineVectorBuilder.h" | 98 #include "web/CompositionUnderlineVectorBuilder.h" |
| 101 #include "web/GraphicsLayerFactoryChromium.h" | 99 #include "web/GraphicsLayerFactoryChromium.h" |
| 102 #include "web/LinkHighlight.h" | 100 #include "web/LinkHighlight.h" |
| 103 #include "web/ViewportAnchor.h" | 101 #include "web/ViewportAnchor.h" |
| 104 #include "web/WebInputEventConversion.h" | 102 #include "web/WebInputEventConversion.h" |
| 105 #include "web/WebLocalFrameImpl.h" | 103 #include "web/WebLocalFrameImpl.h" |
| (...skipping 1775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1881 return; | 1879 return; |
| 1882 | 1880 |
| 1883 m_fixedLayoutSizeLock = layoutSize.width || layoutSize.height; | 1881 m_fixedLayoutSizeLock = layoutSize.width || layoutSize.height; |
| 1884 | 1882 |
| 1885 if (m_fixedLayoutSizeLock) | 1883 if (m_fixedLayoutSizeLock) |
| 1886 view->setLayoutSize(layoutSize); | 1884 view->setLayoutSize(layoutSize); |
| 1887 else | 1885 else |
| 1888 updateMainFrameLayoutSize(); | 1886 updateMainFrameLayoutSize(); |
| 1889 } | 1887 } |
| 1890 | 1888 |
| 1891 void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action, | |
| 1892 const WebPoint& location) | |
| 1893 { | |
| 1894 // FIXME(sky): Remove this. | |
| 1895 } | |
| 1896 | |
| 1897 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) | 1889 WebHitTestResult WebViewImpl::hitTestResultAt(const WebPoint& point) |
| 1898 { | 1890 { |
| 1899 return coreHitTestResultAt(point); | 1891 return coreHitTestResultAt(point); |
| 1900 } | 1892 } |
| 1901 | 1893 |
| 1902 HitTestResult WebViewImpl::coreHitTestResultAt(const WebPoint& point) | 1894 HitTestResult WebViewImpl::coreHitTestResultAt(const WebPoint& point) |
| 1903 { | 1895 { |
| 1904 IntPoint scaledPoint = point; | 1896 IntPoint scaledPoint = point; |
| 1905 return hitTestResultForWindowPos(scaledPoint); | 1897 return hitTestResultForWindowPos(scaledPoint); |
| 1906 } | 1898 } |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2380 m_layerTreeView->setVisible(visible); | 2372 m_layerTreeView->setVisible(visible); |
| 2381 } | 2373 } |
| 2382 } | 2374 } |
| 2383 | 2375 |
| 2384 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 2376 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 2385 { | 2377 { |
| 2386 return true; | 2378 return true; |
| 2387 } | 2379 } |
| 2388 | 2380 |
| 2389 } // namespace blink | 2381 } // namespace blink |
| OLD | NEW |