| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 float y; | 47 float y; |
| 48 bool y_set; | 48 bool y_set; |
| 49 float width; | 49 float width; |
| 50 bool width_set; | 50 bool width_set; |
| 51 float height; | 51 float height; |
| 52 bool height_set; | 52 bool height_set; |
| 53 | 53 |
| 54 bool menu_bar_visible; | 54 bool menu_bar_visible; |
| 55 bool status_bar_visible; | 55 bool status_bar_visible; |
| 56 bool tool_bar_visible; | 56 bool tool_bar_visible; |
| 57 bool location_bar_visible; | |
| 58 bool scrollbars_visible; | 57 bool scrollbars_visible; |
| 59 bool resizable; | 58 bool background; |
| 60 | 59 bool persistent; |
| 61 bool fullscreen; | |
| 62 bool dialog; | |
| 63 WebVector<WebString> additional_features; | |
| 64 | 60 |
| 65 WebWindowFeatures() | 61 WebWindowFeatures() |
| 66 : x(0), | 62 : x(0), |
| 67 x_set(false), | 63 x_set(false), |
| 68 y(0), | 64 y(0), |
| 69 y_set(false), | 65 y_set(false), |
| 70 width(0), | 66 width(0), |
| 71 width_set(false), | 67 width_set(false), |
| 72 height(0), | 68 height(0), |
| 73 height_set(false), | 69 height_set(false), |
| 74 menu_bar_visible(true), | 70 menu_bar_visible(true), |
| 75 status_bar_visible(true), | 71 status_bar_visible(true), |
| 76 tool_bar_visible(true), | 72 tool_bar_visible(true), |
| 77 location_bar_visible(true), | |
| 78 scrollbars_visible(true), | 73 scrollbars_visible(true), |
| 79 resizable(true), | 74 background(false), |
| 80 fullscreen(false), | 75 persistent(false) {} |
| 81 dialog(false) {} | |
| 82 | 76 |
| 83 #if BLINK_IMPLEMENTATION | 77 #if BLINK_IMPLEMENTATION |
| 84 WebWindowFeatures(const WindowFeatures& f) | 78 WebWindowFeatures(const WindowFeatures& f) |
| 85 : x(f.x), | 79 : x(f.x), |
| 86 x_set(f.x_set), | 80 x_set(f.x_set), |
| 87 y(f.y), | 81 y(f.y), |
| 88 y_set(f.y_set), | 82 y_set(f.y_set), |
| 89 width(f.width), | 83 width(f.width), |
| 90 width_set(f.width_set), | 84 width_set(f.width_set), |
| 91 height(f.height), | 85 height(f.height), |
| 92 height_set(f.height_set), | 86 height_set(f.height_set), |
| 93 menu_bar_visible(f.menu_bar_visible), | 87 menu_bar_visible(f.menu_bar_visible), |
| 94 status_bar_visible(f.status_bar_visible), | 88 status_bar_visible(f.status_bar_visible), |
| 95 tool_bar_visible(f.tool_bar_visible), | 89 tool_bar_visible(f.tool_bar_visible), |
| 96 location_bar_visible(f.location_bar_visible), | |
| 97 scrollbars_visible(f.scrollbars_visible), | 90 scrollbars_visible(f.scrollbars_visible), |
| 98 resizable(f.resizable), | 91 background(f.background), |
| 99 fullscreen(f.fullscreen), | 92 persistent(f.persistent) {} |
| 100 dialog(f.dialog), | |
| 101 additional_features(f.additional_features) {} | |
| 102 | 93 |
| 103 operator WindowFeatures() const { | 94 operator WindowFeatures() const { |
| 104 WindowFeatures result; | 95 WindowFeatures result; |
| 105 result.x = x; | 96 result.x = x; |
| 106 result.x_set = x_set; | 97 result.x_set = x_set; |
| 107 result.y = y; | 98 result.y = y; |
| 108 result.y_set = y_set; | 99 result.y_set = y_set; |
| 109 result.width = width; | 100 result.width = width; |
| 110 result.width_set = width_set; | 101 result.width_set = width_set; |
| 111 result.height = height; | 102 result.height = height; |
| 112 result.height_set = height_set; | 103 result.height_set = height_set; |
| 113 result.menu_bar_visible = menu_bar_visible; | 104 result.menu_bar_visible = menu_bar_visible; |
| 114 result.status_bar_visible = status_bar_visible; | 105 result.status_bar_visible = status_bar_visible; |
| 115 result.tool_bar_visible = tool_bar_visible; | 106 result.tool_bar_visible = tool_bar_visible; |
| 116 result.location_bar_visible = location_bar_visible; | |
| 117 result.scrollbars_visible = scrollbars_visible; | 107 result.scrollbars_visible = scrollbars_visible; |
| 118 result.resizable = resizable; | 108 result.background = background; |
| 119 result.fullscreen = fullscreen; | 109 result.persistent = persistent; |
| 120 result.dialog = dialog; | |
| 121 for (size_t i = 0; i < additional_features.size(); ++i) | |
| 122 result.additional_features.push_back(additional_features[i]); | |
| 123 return result; | 110 return result; |
| 124 } | 111 } |
| 125 #endif | 112 #endif |
| 126 }; | 113 }; |
| 127 | 114 |
| 128 } // namespace blink | 115 } // namespace blink |
| 129 | 116 |
| 130 #endif | 117 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2905283003:
Remove a bunch of dead code around WindowFeatures (Closed)
