| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "core/frame/FrameView.h" | 54 #include "core/frame/FrameView.h" |
| 55 #include "core/frame/LocalFrame.h" | 55 #include "core/frame/LocalFrame.h" |
| 56 #include "core/frame/PinchViewport.h" | 56 #include "core/frame/PinchViewport.h" |
| 57 #include "core/frame/RemoteFrame.h" | 57 #include "core/frame/RemoteFrame.h" |
| 58 #include "core/frame/Settings.h" | 58 #include "core/frame/Settings.h" |
| 59 #include "core/frame/SmartClip.h" | 59 #include "core/frame/SmartClip.h" |
| 60 #include "core/html/HTMLInputElement.h" | 60 #include "core/html/HTMLInputElement.h" |
| 61 #include "core/html/HTMLMediaElement.h" | 61 #include "core/html/HTMLMediaElement.h" |
| 62 #include "core/html/HTMLPlugInElement.h" | 62 #include "core/html/HTMLPlugInElement.h" |
| 63 #include "core/html/HTMLTextAreaElement.h" | 63 #include "core/html/HTMLTextAreaElement.h" |
| 64 #include "core/html/canvas/WebGLRenderingContext.h" |
| 64 #include "core/html/ime/InputMethodContext.h" | 65 #include "core/html/ime/InputMethodContext.h" |
| 65 #include "core/inspector/InspectorController.h" | 66 #include "core/inspector/InspectorController.h" |
| 66 #include "core/loader/DocumentLoader.h" | 67 #include "core/loader/DocumentLoader.h" |
| 67 #include "core/loader/FrameLoader.h" | 68 #include "core/loader/FrameLoader.h" |
| 68 #include "core/loader/UniqueIdentifier.h" | 69 #include "core/loader/UniqueIdentifier.h" |
| 69 #include "core/page/Chrome.h" | 70 #include "core/page/Chrome.h" |
| 70 #include "core/page/ContextMenuController.h" | 71 #include "core/page/ContextMenuController.h" |
| 71 #include "core/page/ContextMenuProvider.h" | 72 #include "core/page/ContextMenuProvider.h" |
| 72 #include "core/page/DragController.h" | 73 #include "core/page/DragController.h" |
| 73 #include "core/page/DragData.h" | 74 #include "core/page/DragData.h" |
| (...skipping 4419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4493 | 4494 |
| 4494 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4495 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4495 | 4496 |
| 4496 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4497 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4497 return false; | 4498 return false; |
| 4498 | 4499 |
| 4499 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4500 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4500 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4501 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4501 } | 4502 } |
| 4502 | 4503 |
| 4504 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4505 { |
| 4506 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4507 } |
| 4508 |
| 4503 } // namespace blink | 4509 } // namespace blink |
| OLD | NEW |