Title: [154605] trunk/Source/WebCore
- Revision
- 154605
- Author
- [email protected]
- Date
- 2013-08-26 09:09:50 -0700 (Mon, 26 Aug 2013)
Log Message
[Windows] Build fix after r154580.
* rendering/RenderThemeWin.cpp: Mirror changes made for other ports now that
Frame is known to always be valid when in a render tree. This allows us to
get rid of some unneeded null checks.
(WebCore::RenderThemeWin::getThemeData):
(WebCore::RenderThemeWin::paintMenuList):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154604 => 154605)
--- trunk/Source/WebCore/ChangeLog 2013-08-26 15:53:22 UTC (rev 154604)
+++ trunk/Source/WebCore/ChangeLog 2013-08-26 16:09:50 UTC (rev 154605)
@@ -1,5 +1,15 @@
2013-08-26 Brent Fulgham <[email protected]>
+ [Windows] Build fix after r154580.
+
+ * rendering/RenderThemeWin.cpp: Mirror changes made for other ports now that
+ Frame is known to always be valid when in a render tree. This allows us to
+ get rid of some unneeded null checks.
+ (WebCore::RenderThemeWin::getThemeData):
+ (WebCore::RenderThemeWin::paintMenuList):
+
+2013-08-26 Brent Fulgham <[email protected]>
+
[Windows] Build fix after r154554.
* page/AutoscrollController.cpp: Correct various places where pointers are now
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (154604 => 154605)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-26 15:53:22 UTC (rev 154604)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-26 16:09:50 UTC (rev 154605)
@@ -175,12 +175,6 @@
static bool gWebKitIsBeingUnloaded;
-static bool documentIsInApplicationChromeMode(const Document* document)
-{
- Settings* settings = document->settings();
- return settings && settings->applicationChromeMode();
-}
-
void RenderThemeWin::setWebKitIsBeingUnloaded()
{
gWebKitIsBeingUnloaded = true;
@@ -622,7 +616,7 @@
case MenulistButtonPart: {
const bool isVistaOrLater = (windowsVersion() >= WindowsVista);
result.m_part = isVistaOrLater ? CP_DROPDOWNBUTTONRIGHT : CP_DROPDOWNBUTTON;
- if (isVistaOrLater && documentIsInApplicationChromeMode(o->document())) {
+ if (isVistaOrLater && o->frame().settings().applicationChromeMode()) {
// The "readonly" look we use in application chrome mode
// only uses a "normal" look for the drop down button.
result.m_state = TS_NORMAL;
@@ -787,7 +781,7 @@
int part;
if (haveTheme && (windowsVersion() >= WindowsVista)) {
theme = menuListTheme();
- if (documentIsInApplicationChromeMode(o->document()))
+ if (o->frame().settings().applicationChromeMode())
part = CP_READONLY;
else
part = CP_BORDER;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
