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

Side by Side Diff: Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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/WebKit/mac/Plugins/WebBaseNetscapePluginView.h ('k') | Source/WebKit2/ChangeLog » ('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) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed.
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 if (event->type() == eventNames().mousemoveEvent) 1576 if (event->type() == eventNames().mousemoveEvent)
1577 [(WebBaseNetscapePluginView *)platformWidget() handleMouseMoved:curr entNSEvent]; 1577 [(WebBaseNetscapePluginView *)platformWidget() handleMouseMoved:curr entNSEvent];
1578 else if (event->type() == eventNames().mouseoverEvent) 1578 else if (event->type() == eventNames().mouseoverEvent)
1579 [(WebBaseNetscapePluginView *)platformWidget() handleMouseEntered:cu rrentNSEvent]; 1579 [(WebBaseNetscapePluginView *)platformWidget() handleMouseEntered:cu rrentNSEvent];
1580 else if (event->type() == eventNames().mouseoutEvent) 1580 else if (event->type() == eventNames().mouseoutEvent)
1581 [(WebBaseNetscapePluginView *)platformWidget() handleMouseExited:cur rentNSEvent]; 1581 [(WebBaseNetscapePluginView *)platformWidget() handleMouseExited:cur rentNSEvent];
1582 else if (event->type() == eventNames().contextmenuEvent) 1582 else if (event->type() == eventNames().contextmenuEvent)
1583 event->setDefaultHandled(); // We don't know if the plug-in has hand led mousedown event by displaying a context menu, so we never want WebKit to sho w a default one. 1583 event->setDefaultHandled(); // We don't know if the plug-in has hand led mousedown event by displaying a context menu, so we never want WebKit to sho w a default one.
1584 } 1584 }
1585 1585
1586 virtual void clipRectChanged()
1587 {
1588 // Changing the clip rect doesn't affect the view hierarchy, so the plug in must be told about the change directly.
1589 [(WebBaseNetscapePluginView *)platformWidget() updateAndSetWindow];
1590 }
1591
1586 private: 1592 private:
1587 virtual void notifyWidget(WidgetNotification notification) 1593 virtual void notifyWidget(WidgetNotification notification)
1588 { 1594 {
1589 switch (notification) { 1595 switch (notification) {
1590 case WillPaintFlattened: { 1596 case WillPaintFlattened: {
1591 BEGIN_BLOCK_OBJC_EXCEPTIONS; 1597 BEGIN_BLOCK_OBJC_EXCEPTIONS;
1592 [(WebBaseNetscapePluginView *)platformWidget() cacheSnapshot]; 1598 [(WebBaseNetscapePluginView *)platformWidget() cacheSnapshot];
1593 END_BLOCK_OBJC_EXCEPTIONS; 1599 END_BLOCK_OBJC_EXCEPTIONS;
1594 break; 1600 break;
1595 } 1601 }
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2050 { 2056 {
2051 [self receivedPolicyDecision:PolicyUse]; 2057 [self receivedPolicyDecision:PolicyUse];
2052 } 2058 }
2053 2059
2054 - (void)continue 2060 - (void)continue
2055 { 2061 {
2056 [self receivedPolicyDecision:PolicyUse]; 2062 [self receivedPolicyDecision:PolicyUse];
2057 } 2063 }
2058 2064
2059 @end 2065 @end
OLDNEW
« no previous file with comments | « Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h ('k') | Source/WebKit2/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698