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

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

Issue 12475008: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
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 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 if (event->type() == eventNames().mousemoveEvent) 1564 if (event->type() == eventNames().mousemoveEvent)
1565 [(WebBaseNetscapePluginView *)platformWidget() handleMouseMoved:curr entNSEvent]; 1565 [(WebBaseNetscapePluginView *)platformWidget() handleMouseMoved:curr entNSEvent];
1566 else if (event->type() == eventNames().mouseoverEvent) 1566 else if (event->type() == eventNames().mouseoverEvent)
1567 [(WebBaseNetscapePluginView *)platformWidget() handleMouseEntered:cu rrentNSEvent]; 1567 [(WebBaseNetscapePluginView *)platformWidget() handleMouseEntered:cu rrentNSEvent];
1568 else if (event->type() == eventNames().mouseoutEvent) 1568 else if (event->type() == eventNames().mouseoutEvent)
1569 [(WebBaseNetscapePluginView *)platformWidget() handleMouseExited:cur rentNSEvent]; 1569 [(WebBaseNetscapePluginView *)platformWidget() handleMouseExited:cur rentNSEvent];
1570 else if (event->type() == eventNames().contextmenuEvent) 1570 else if (event->type() == eventNames().contextmenuEvent)
1571 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. 1571 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.
1572 } 1572 }
1573 1573
1574 virtual void clipRectChanged()
1575 {
1576 // Changing the clip rect doesn't affect the view hierarchy, so the plug in must be told about the change directly.
1577 [(WebBaseNetscapePluginView *)platformWidget() updateAndSetWindow];
1578 }
1579
1574 private: 1580 private:
1575 virtual void notifyWidget(WidgetNotification notification) 1581 virtual void notifyWidget(WidgetNotification notification)
1576 { 1582 {
1577 switch (notification) { 1583 switch (notification) {
1578 case WillPaintFlattened: { 1584 case WillPaintFlattened: {
1579 BEGIN_BLOCK_OBJC_EXCEPTIONS; 1585 BEGIN_BLOCK_OBJC_EXCEPTIONS;
1580 [(WebBaseNetscapePluginView *)platformWidget() cacheSnapshot]; 1586 [(WebBaseNetscapePluginView *)platformWidget() cacheSnapshot];
1581 END_BLOCK_OBJC_EXCEPTIONS; 1587 END_BLOCK_OBJC_EXCEPTIONS;
1582 break; 1588 break;
1583 } 1589 }
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 { 2044 {
2039 [self receivedPolicyDecision:PolicyUse]; 2045 [self receivedPolicyDecision:PolicyUse];
2040 } 2046 }
2041 2047
2042 - (void)continue 2048 - (void)continue
2043 { 2049 {
2044 [self receivedPolicyDecision:PolicyUse]; 2050 [self receivedPolicyDecision:PolicyUse];
2045 } 2051 }
2046 2052
2047 @end 2053 @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