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

Side by Side Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 605
606 void WebPluginContainerImpl::willEndLiveResize() 606 void WebPluginContainerImpl::willEndLiveResize()
607 { 607 {
608 if (m_scrollbarGroup) 608 if (m_scrollbarGroup)
609 m_scrollbarGroup->willEndLiveResize(); 609 m_scrollbarGroup->willEndLiveResize();
610 } 610 }
611 611
612 bool WebPluginContainerImpl::paintCustomOverhangArea(GraphicsContext* context, c onst IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) 612 bool WebPluginContainerImpl::paintCustomOverhangArea(GraphicsContext* context, c onst IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
613 { 613 {
614 context->save(); 614 context->save();
615 context->setFillColor(Color(0xCC, 0xCC, 0xCC), ColorSpaceDeviceRGB); 615 context->setFillColor(Color(0xCC, 0xCC, 0xCC));
616 context->fillRect(intersection(horizontalOverhangArea, dirtyRect)); 616 context->fillRect(intersection(horizontalOverhangArea, dirtyRect));
617 context->fillRect(intersection(verticalOverhangArea, dirtyRect)); 617 context->fillRect(intersection(verticalOverhangArea, dirtyRect));
618 context->restore(); 618 context->restore();
619 return true; 619 return true;
620 } 620 }
621 621
622 // Private methods ------------------------------------------------------------- 622 // Private methods -------------------------------------------------------------
623 623
624 WebPluginContainerImpl::WebPluginContainerImpl(WebCore::HTMLPlugInElement* eleme nt, WebPlugin* webPlugin) 624 WebPluginContainerImpl::WebPluginContainerImpl(WebCore::HTMLPlugInElement* eleme nt, WebPlugin* webPlugin)
625 : m_element(element) 625 : m_element(element)
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 // Take our element and get the clip rect from the enclosing layer and 873 // Take our element and get the clip rect from the enclosing layer and
874 // frame view. 874 // frame view.
875 clipRect.intersect( 875 clipRect.intersect(
876 m_element->document()->view()->windowClipRectForFrameOwner(m_element , true)); 876 m_element->document()->view()->windowClipRectForFrameOwner(m_element , true));
877 } 877 }
878 878
879 return clipRect; 879 return clipRect;
880 } 880 }
881 881
882 } // namespace WebKit 882 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebFrameImpl.cpp ('k') | Source/WebKit/chromium/tests/DragImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698