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

Issue 154733004: Switch to a single merged version of WebThemeEngine.h (Closed)

Created:
6 years, 10 months ago by Dirk Pranke
Modified:
6 years, 10 months ago
Reviewers:
jamesr
CC:
blink-reviews, jamesr, bemjb+rendering_chromium.org, dsinclair, zoltan1, eae+blinkwatch, leviw+renderwatch, abarth-chromium, dglazkov+blink, jchaffraix+rendering
Visibility:
Public.

Description

Switch to a single merged version of WebThemeEngine.h instead of using multiple platform-specific versions; the latter made it confusing to know which files to include and what was safe. Ultimately we still need to merge this further into a single consistent cross-platform API, though. R=jamesr@chromium.org BUG=327471 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=166988

Patch Set 1 #

Patch Set 2 : add missing DEPS file #

Total comments: 4

Patch Set 3 : remove ifdefs #

Total comments: 2

Patch Set 4 : fix comments about which states are shared #

Patch Set 5 : restore public/platform/default forwarding header #

Patch Set 6 : reorder the State enums to not break the mock theme #

Unified diffs Side-by-side diffs Delta from patch set Stats (+68 lines, -287 lines) Patch
M Source/core/rendering/RenderThemeChromiumAndroid.cpp View 1 chunk +1 line, -1 line 0 comments Download
M Source/core/rendering/RenderThemeChromiumDefault.cpp View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M Source/platform/scroll/ScrollbarThemeGtkOrAura.cpp View 1 chunk +1 line, -1 line 0 comments Download
M Source/platform/scroll/ScrollbarThemeMacCommon.mm View 1 chunk +1 line, -1 line 0 comments Download
M Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm View 1 chunk +1 line, -1 line 0 comments Download
A + public/platform/WebThemeEngine.h View 1 2 3 4 5 2 chunks +46 lines, -12 lines 0 comments Download
M public/platform/android/DEPS View 1 chunk +1 line, -1 line 0 comments Download
M public/platform/android/WebThemeEngine.h View 1 chunk +2 lines, -2 lines 0 comments Download
A public/platform/default/DEPS View 1 2 3 4 1 chunk +4 lines, -0 lines 0 comments Download
D public/platform/default/WebThemeEngine.h View 1 2 3 4 1 chunk +3 lines, -128 lines 0 comments Download
A public/platform/mac/DEPS View 1 1 chunk +4 lines, -0 lines 0 comments Download
M public/platform/mac/WebThemeEngine.h View 1 chunk +3 lines, -47 lines 0 comments Download
D public/platform/win/WebThemeEngine.h View 1 chunk +0 lines, -92 lines 0 comments Download

Messages

Total messages: 25 (0 generated)
Dirk Pranke
James, as discussed, this is the lame-but-easy-and-fast version of merging the two headers behind #defines. ...
6 years, 10 months ago (2014-02-05 01:18:47 UTC) #1
jamesr
https://codereview.chromium.org/154733004/diff/30001/public/platform/WebThemeEngine.h File public/platform/WebThemeEngine.h (right): https://codereview.chromium.org/154733004/diff/30001/public/platform/WebThemeEngine.h#newcode50 public/platform/WebThemeEngine.h:50: #ifdef __APPLE__ why make these conditional? i think the ...
6 years, 10 months ago (2014-02-05 20:30:33 UTC) #2
Dirk Pranke
https://codereview.chromium.org/154733004/diff/30001/public/platform/WebThemeEngine.h File public/platform/WebThemeEngine.h (right): https://codereview.chromium.org/154733004/diff/30001/public/platform/WebThemeEngine.h#newcode50 public/platform/WebThemeEngine.h:50: #ifdef __APPLE__ On 2014/02/05 20:30:33, jamesr wrote: > why ...
6 years, 10 months ago (2014-02-05 21:34:38 UTC) #3
Dirk Pranke
Looks like we're safe to remove the ifdefs and just take the union of the ...
6 years, 10 months ago (2014-02-06 00:57:07 UTC) #4
jamesr
lgtm https://codereview.chromium.org/154733004/diff/100001/public/platform/WebThemeEngine.h File public/platform/WebThemeEngine.h (right): https://codereview.chromium.org/154733004/diff/100001/public/platform/WebThemeEngine.h#newcode53 public/platform/WebThemeEngine.h:53: StatePressed, // non-Apple iirc, StatePressed existed in both ...
6 years, 10 months ago (2014-02-06 01:10:53 UTC) #5
Dirk Pranke
https://codereview.chromium.org/154733004/diff/100001/public/platform/WebThemeEngine.h File public/platform/WebThemeEngine.h (right): https://codereview.chromium.org/154733004/diff/100001/public/platform/WebThemeEngine.h#newcode53 public/platform/WebThemeEngine.h:53: StatePressed, // non-Apple On 2014/02/06 01:10:53, jamesr wrote: > ...
6 years, 10 months ago (2014-02-07 00:20:08 UTC) #6
Dirk Pranke
The CQ bit was checked by dpranke@chromium.org
6 years, 10 months ago (2014-02-07 00:24:59 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/150001
6 years, 10 months ago (2014-02-07 00:25:13 UTC) #8
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 10 months ago (2014-02-07 01:39:54 UTC) #9
commit-bot: I haz the power
Retried try job too often on linux_blink_rel for step(s) blink_heap_unittests, blink_platform_unittests, webkit_lint, webkit_python_tests, webkit_tests, webkit_unit_tests, ...
6 years, 10 months ago (2014-02-07 01:39:54 UTC) #10
Dirk Pranke
The CQ bit was checked by dpranke@chromium.org
6 years, 10 months ago (2014-02-07 02:36:37 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/310001
6 years, 10 months ago (2014-02-07 02:36:42 UTC) #12
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 10 months ago (2014-02-07 04:54:45 UTC) #13
commit-bot: I haz the power
Retried try job too often on win_blink_rel for step(s) blink_heap_unittests, blink_platform_unittests, webkit_lint, webkit_python_tests, webkit_tests, webkit_unit_tests, ...
6 years, 10 months ago (2014-02-07 04:54:46 UTC) #14
Dirk Pranke
The CQ bit was checked by dpranke@chromium.org
6 years, 10 months ago (2014-02-10 22:34:45 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/470001
6 years, 10 months ago (2014-02-10 22:35:24 UTC) #16
Dirk Pranke
It turns out the mock theme had a lookup table to determine what color to ...
6 years, 10 months ago (2014-02-10 22:36:29 UTC) #17
jamesr
Seems fine (still lgtm)
6 years, 10 months ago (2014-02-10 22:38:49 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/470001
6 years, 10 months ago (2014-02-10 23:43:06 UTC) #19
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 10 months ago (2014-02-11 03:04:17 UTC) #20
commit-bot: I haz the power
Retried try job too often on win_blink_rel for step(s) blink_heap_unittests, blink_platform_unittests, webkit_lint, webkit_python_tests, webkit_tests, webkit_unit_tests, ...
6 years, 10 months ago (2014-02-11 03:04:18 UTC) #21
Dirk Pranke
The CQ bit was checked by dpranke@chromium.org
6 years, 10 months ago (2014-02-11 21:56:26 UTC) #22
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/470001
6 years, 10 months ago (2014-02-11 21:56:42 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dpranke@chromium.org/154733004/470001
6 years, 10 months ago (2014-02-12 01:58:13 UTC) #24
commit-bot: I haz the power
6 years, 10 months ago (2014-02-12 08:22:03 UTC) #25
Message was sent while issue was closed.
Change committed as 166988

Powered by Google App Engine
This is Rietveld 408576698