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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 #include "MIDIClientProxy.h" | 61 #include "MIDIClientProxy.h" |
62 #include "PageWidgetDelegate.h" | 62 #include "PageWidgetDelegate.h" |
63 #include "PinchViewports.h" | 63 #include "PinchViewports.h" |
64 #include "PopupContainer.h" | 64 #include "PopupContainer.h" |
65 #include "PrerendererClientImpl.h" | 65 #include "PrerendererClientImpl.h" |
66 #include "RuntimeEnabledFeatures.h" | 66 #include "RuntimeEnabledFeatures.h" |
67 #include "SpeechInputClientImpl.h" | 67 #include "SpeechInputClientImpl.h" |
68 #include "SpeechRecognitionClientProxy.h" | 68 #include "SpeechRecognitionClientProxy.h" |
69 #include "ValidationMessageClientImpl.h" | 69 #include "ValidationMessageClientImpl.h" |
70 #include "ViewportAnchor.h" | 70 #include "ViewportAnchor.h" |
71 #include "WebAccessibilityObject.h" | 71 #include "WebAXObject.h" |
72 #include "WebActiveWheelFlingParameters.h" | 72 #include "WebActiveWheelFlingParameters.h" |
73 #include "WebAutofillClient.h" | 73 #include "WebAutofillClient.h" |
74 #include "WebDevToolsAgentImpl.h" | 74 #include "WebDevToolsAgentImpl.h" |
75 #include "WebDevToolsAgentPrivate.h" | 75 #include "WebDevToolsAgentPrivate.h" |
76 #include "WebFrameImpl.h" | 76 #include "WebFrameImpl.h" |
77 #include "WebHelperPluginImpl.h" | 77 #include "WebHelperPluginImpl.h" |
78 #include "WebHitTestResult.h" | 78 #include "WebHitTestResult.h" |
79 #include "WebInputElement.h" | 79 #include "WebInputElement.h" |
80 #include "WebInputEvent.h" | 80 #include "WebInputEvent.h" |
81 #include "WebInputEventConversion.h" | 81 #include "WebInputEventConversion.h" |
(...skipping 3328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3410 { | 3410 { |
3411 m_inspectorSettingsMap->set(key, value); | 3411 m_inspectorSettingsMap->set(key, value); |
3412 client()->didUpdateInspectorSetting(key, value); | 3412 client()->didUpdateInspectorSetting(key, value); |
3413 } | 3413 } |
3414 | 3414 |
3415 WebDevToolsAgent* WebViewImpl::devToolsAgent() | 3415 WebDevToolsAgent* WebViewImpl::devToolsAgent() |
3416 { | 3416 { |
3417 return m_devToolsAgent.get(); | 3417 return m_devToolsAgent.get(); |
3418 } | 3418 } |
3419 | 3419 |
3420 WebAccessibilityObject WebViewImpl::accessibilityObject() | 3420 WebAXObject WebViewImpl::accessibilityObject() |
3421 { | 3421 { |
3422 if (!mainFrameImpl()) | 3422 if (!mainFrameImpl()) |
3423 return WebAccessibilityObject(); | 3423 return WebAXObject(); |
3424 | 3424 |
3425 Document* document = mainFrameImpl()->frame()->document(); | 3425 Document* document = mainFrameImpl()->frame()->document(); |
3426 return WebAccessibilityObject( | 3426 return WebAXObject( |
3427 document->axObjectCache()->getOrCreate(document->renderer())); | 3427 document->axObjectCache()->getOrCreate(document->renderer())); |
3428 } | 3428 } |
3429 | 3429 |
3430 void WebViewImpl::applyAutofillSuggestions( | 3430 void WebViewImpl::applyAutofillSuggestions( |
3431 const WebNode& node, | 3431 const WebNode& node, |
3432 const WebVector<WebString>& names, | 3432 const WebVector<WebString>& names, |
3433 const WebVector<WebString>& labels, | 3433 const WebVector<WebString>& labels, |
3434 const WebVector<WebString>& icons, | 3434 const WebVector<WebString>& icons, |
3435 const WebVector<int>& itemIDs, | 3435 const WebVector<int>& itemIDs, |
3436 int separatorIndex) | 3436 int separatorIndex) |
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4114 // the initial viewport width. | 4114 // the initial viewport width. |
4115 // 2. The author has disabled viewport zoom. | 4115 // 2. The author has disabled viewport zoom. |
4116 | 4116 |
4117 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4117 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4118 | 4118 |
4119 return fixedLayoutSize().width == m_size.width | 4119 return fixedLayoutSize().width == m_size.width |
4120 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4120 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4121 } | 4121 } |
4122 | 4122 |
4123 } // namespace WebKit | 4123 } // namespace WebKit |
OLD | NEW |