Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 1005223002: Blink: Replace all "plug-in" with "plugin". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Revert netscape-dom-access tests. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/web/WebFrameWidgetImpl.cpp ('k') | public/web/WebContentSettingsClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 1045
1046 if (!focusedFrame || !focusedFrame->isLocalFrame()) 1046 if (!focusedFrame || !focusedFrame->isLocalFrame())
1047 return false; 1047 return false;
1048 1048
1049 LocalFrame* frame = toLocalFrame(focusedFrame.get()); 1049 LocalFrame* frame = toLocalFrame(focusedFrame.get());
1050 1050
1051 PlatformKeyboardEventBuilder evt(event); 1051 PlatformKeyboardEventBuilder evt(event);
1052 1052
1053 if (frame->eventHandler().keyEvent(evt)) { 1053 if (frame->eventHandler().keyEvent(evt)) {
1054 if (WebInputEvent::RawKeyDown == event.type) { 1054 if (WebInputEvent::RawKeyDown == event.type) {
1055 // Suppress the next keypress event unless the focused node is a plu g-in node. 1055 // Suppress the next keypress event unless the focused node is a plu gin node.
1056 // (Flash needs these keypress events to handle non-US keyboards.) 1056 // (Flash needs these keypress events to handle non-US keyboards.)
1057 Element* element = focusedElement(); 1057 Element* element = focusedElement();
1058 if (!element || !element->layoutObject() || !element->layoutObject() ->isEmbeddedObject()) 1058 if (!element || !element->layoutObject() || !element->layoutObject() ->isEmbeddedObject())
1059 m_suppressNextKeypressEvent = true; 1059 m_suppressNextKeypressEvent = true;
1060 } 1060 }
1061 return true; 1061 return true;
1062 } 1062 }
1063 1063
1064 #if !OS(MACOSX) 1064 #if !OS(MACOSX)
1065 const WebInputEvent::Type contextMenuTriggeringEventType = 1065 const WebInputEvent::Type contextMenuTriggeringEventType =
(...skipping 3625 matching lines...) Expand 10 before | Expand all | Expand 10 after
4691 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4691 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4692 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4692 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4693 } 4693 }
4694 4694
4695 void WebViewImpl::forceNextWebGLContextCreationToFail() 4695 void WebViewImpl::forceNextWebGLContextCreationToFail()
4696 { 4696 {
4697 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4697 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4698 } 4698 }
4699 4699
4700 } // namespace blink 4700 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebFrameWidgetImpl.cpp ('k') | public/web/WebContentSettingsClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698