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

Unified Diff: Source/core/layout/LayoutTheme.h

Issue 895383002: Let StyleResolver figure out differences between UA style and resolved style. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: I mean *remove* assert. Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/layout/LayoutTheme.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTheme.h
diff --git a/Source/core/layout/LayoutTheme.h b/Source/core/layout/LayoutTheme.h
index 6da0b1ad361d2543982f15ce222fb39644f48020..e46bf0cb9af6346e4cb5a29bc196c1a80ea61d68 100644
--- a/Source/core/layout/LayoutTheme.h
+++ b/Source/core/layout/LayoutTheme.h
@@ -29,7 +29,6 @@
#include "platform/ThemeTypes.h"
#endif
#include "core/layout/LayoutObject.h"
-#include "core/layout/style/CachedUAStyle.h"
#include "platform/scroll/ScrollTypes.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
@@ -37,6 +36,7 @@
namespace blink {
+class AuthorStyleInfo;
class Element;
class FileList;
class HTMLInputElement;
@@ -62,7 +62,7 @@ public:
// metrics and defaults given the contents of the style. This includes sophisticated operations like
// selection of control size based off the font, the disabling of appearance when certain other properties like
// "border" are set, or if the appearance is not supported by the theme.
- void adjustStyle(LayoutStyle&, Element*, const CachedUAStyle*);
+ void adjustStyle(LayoutStyle&, Element*, const AuthorStyleInfo&);
// This method is called to paint the widget as a background of the LayoutObject. A widget's foreground, e.g., the
// text of a button, is always rendered by the engine itself. The boolean return value indicates
@@ -91,7 +91,7 @@ public:
bool isControlContainer(ControlPart) const;
// Whether or not the control has been styled enough by the author to disable the native appearance.
- virtual bool isControlStyled(const LayoutStyle&, const CachedUAStyle*) const;
+ virtual bool isControlStyled(const LayoutStyle&, const AuthorStyleInfo&) const;
// Some controls may spill out of their containers (e.g., the check on an OS X checkbox). When these controls issues paint invalidations,
// the theme needs to communicate this inflated rect to the engine so that it can invalidate the whole control.
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/layout/LayoutTheme.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698